Skip to content

Commit 22264f7

Browse files
dreamcat4dreamcat four
dreamcat4
authored and
dreamcat four
committed
(fix) make install target
1 parent 2b07905 commit 22264f7

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

‎Makefile.in

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ $(php_fpm_bin): php_fpm
731731

732732
install: $(php_fpm_bin) install-fpm
733733

734-
install-fpm: $(php_fpm_bin)
734+
install-fpm: all
735735
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(php_fpm_bin_path)"
736736
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_bin_dir)
737737
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir)
@@ -761,15 +761,18 @@ install-fpm: $(php_fpm_bin)
761761

762762
@test -d /etc/nginx/ && \
763763
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
764-
@$(INSTALL_DATA) -b nginx-site-conf.sample /etc/nginx/nginx-site-conf.sample || :
764+
$(mkinstalldirs) $(INSTALL_ROOT)/etc/nginx && \
765+
$(INSTALL_DATA) -b nginx-site-conf.sample /etc/nginx/nginx-site-conf.sample || :
765766

766767
@test -d /usr/local/etc/nginx/ && \
767768
echo "Installing NGINX sample config: /usr/local/etc/nginx/nginx-site-conf.sample" && \
768-
@$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/etc/nginx/nginx-site-conf.sample || :
769+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/etc/nginx && \
770+
$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/etc/nginx/nginx-site-conf.sample || :
769771

770772
@test -d /usr/local/nginx/conf/ && \
771773
echo "Installing NGINX sample config: /usr/local/nginx/conf/nginx-site-conf.sample" && \
772-
@$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/nginx/conf/nginx-site-conf.sample || :
774+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/nginx/conf && \
775+
$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/nginx/conf/nginx-site-conf.sample || :
773776

774777
@echo ""
775778
@echo "*** FPM Installation complete. ***"

‎ac/Makefile.frag

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ fpm: $(SAPI_FPM_PATH)
33
$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
44
$(BUILD_FPM)
55

6-
install: $(php_fpm_bin) install-fpm
6+
install: install-fpm
77

8-
install-fpm: $(SAPI_FPM_PATH)
8+
install-fpm: all
99
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(php_fpm_bin_path)"
1010
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_bin_dir)
1111
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir)
@@ -35,15 +35,18 @@ install-fpm: $(SAPI_FPM_PATH)
3535

3636
@test -d /etc/nginx/ && \
3737
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
38-
@$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample /etc/nginx/nginx-site-conf.sample
38+
$(mkinstalldirs) $(INSTALL_ROOT)/etc/nginx && \
39+
$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample /etc/nginx/nginx-site-conf.sample || :
3940

4041
@test -d /usr/local/etc/nginx/ && \
4142
echo "Installing NGINX sample config: /usr/local/etc/nginx/nginx-site-conf.sample" && \
42-
@$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample /usr/local/etc/nginx/nginx-site-conf.sample || :
43+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/etc/nginx && \
44+
$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample /usr/local/etc/nginx/nginx-site-conf.sample || :
4345

4446
@test -d /usr/local/nginx/conf/ && \
4547
echo "Installing NGINX sample config: /usr/local/nginx/conf/nginx-site-conf.sample" && \
46-
@$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample /usr/local/nginx/conf/nginx-site-conf.sample || :
48+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/nginx/conf && \
49+
$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample /usr/local/nginx/conf/nginx-site-conf.sample || :
4750

4851
@echo ""
4952
@echo "*** FPM Installation complete. ***"

‎m4/Makefile.frag

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
install: $(php_fpm_bin) install-fpm
77

8-
install-fpm: $(php_fpm_bin)
8+
install-fpm: all
99
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(php_fpm_bin_path)"
1010
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_bin_dir)
1111
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir)
@@ -35,15 +35,18 @@ install-fpm: $(php_fpm_bin)
3535

3636
@test -d /etc/nginx/ && \
3737
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
38-
@$(INSTALL_DATA) -b nginx-site-conf.sample /etc/nginx/nginx-site-conf.sample || :
38+
$(mkinstalldirs) $(INSTALL_ROOT)/etc/nginx && \
39+
$(INSTALL_DATA) -b nginx-site-conf.sample /etc/nginx/nginx-site-conf.sample || :
3940

4041
@test -d /usr/local/etc/nginx/ && \
4142
echo "Installing NGINX sample config: /usr/local/etc/nginx/nginx-site-conf.sample" && \
42-
@$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/etc/nginx/nginx-site-conf.sample || :
43+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/etc/nginx && \
44+
$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/etc/nginx/nginx-site-conf.sample || :
4345

4446
@test -d /usr/local/nginx/conf/ && \
4547
echo "Installing NGINX sample config: /usr/local/nginx/conf/nginx-site-conf.sample" && \
46-
@$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/nginx/conf/nginx-site-conf.sample || :
48+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/nginx/conf && \
49+
$(INSTALL_DATA) -b nginx-site-conf.sample /usr/local/nginx/conf/nginx-site-conf.sample || :
4750

4851
@echo ""
4952
@echo "*** FPM Installation complete. ***"

0 commit comments

Comments
 (0)