diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-02-22 06:48:48 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-02-22 06:48:48 +0000 |
| commit | 46d093366805cbc883c8c89806d73be2b88e71a2 (patch) | |
| tree | f96ed82cc0991a0a91fd36664f9cacf14998a4d6 | |
| parent | 500232ef35655227994ede3fbcbbf3e5a8cd9082 (diff) | |
| parent | 9eaf551c86593697805b4f8f75a2d5b83b45fc1e (diff) | |
| download | php-git-46d093366805cbc883c8c89806d73be2b88e71a2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
pull-request/2393:
stop fpm make install clobbering dot d configuration
| -rw-r--r-- | Makefile.global | 2 | ||||
| -rw-r--r-- | sapi/fpm/Makefile.frag | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.global b/Makefile.global index 9b29d5112b..c571f3455d 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 b0b4b34658..b4c08b4fa5 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 |