com php-src: pull-request/2393:: Makefile.global sapi/fpm/Makefile.frag
| From: | Joe Watkins | Date: | Wed, 22 Feb 2017 06:47:23 +0000 |
| Subject: | com php-src: pull-request/2393:: Makefile.global sapi/fpm/Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97150@lists.php.net to get a copy of this message | ||
Commit: 9eaf551c86593697805b4f8f75a2d5b83b45fc1e
Author: Coenraad Loubser <coenraad@wish.org.za> Tue, 21 Feb 2017 04:02:22 +0200
Committer: Joe Watkins <krakjoe@php.net> Wed, 22 Feb 2017 06:47:23 +0000
Parents: 593a4d8fe927694723c92f9382a98b62221ee8fa
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9eaf551c86593697805b4f8f75a2d5b83b45fc1e
Log:
pull-request/2393:
stop make install from clobbering default dot d configuration
Changed paths:
M Makefile.global
M sapi/fpm/Makefile.frag
Diff:
diff --git a/Makefile.global b/Makefile.global
index 9b29d51..c571f34 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -53,7 +53,7 @@ install-headers:
paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
done; \
$(mkinstalldirs) $$paths && \
- echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
+ echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
for i in
echo $(INSTALL_HEADERS); do \
if test "$(PHP_PECL_EXTENSION)"; then \
src=echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"; \
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag
index b0b4b34..b4c08b4 100644
--- a/sapi/fpm/Makefile.frag
+++ b/sapi/fpm/Makefile.frag
@@ -10,11 +10,15 @@ install-fpm: $(SAPI_FPM_PATH)
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
@$(INSTALL) -m 0755 $(SAPI_FPM_PATH)
$(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
- @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
- $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
- @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
-
+ @if test -f "$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf"; then \
+ echo "Installing PHP FPM defconfig: skipping"; \
+ else \
+ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
+ fi
+
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8