diff options
| author | Coenraad Loubser <coenraad@wish.org.za> | 2017-02-21 04:02:22 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-02-22 06:47:23 +0000 |
| commit | 9eaf551c86593697805b4f8f75a2d5b83b45fc1e (patch) | |
| tree | 10204ef77c3d1a1b86087f7f5b4d3d1b3794d8a2 /sapi/fpm/Makefile.frag | |
| parent | 593a4d8fe927694723c92f9382a98b62221ee8fa (diff) | |
| download | php-git-9eaf551c86593697805b4f8f75a2d5b83b45fc1e.tar.gz | |
pull-request/2393:
stop make install from clobbering default dot d configuration
Diffstat (limited to 'sapi/fpm/Makefile.frag')
| -rw-r--r-- | sapi/fpm/Makefile.frag | 14 |
1 files changed, 9 insertions, 5 deletions
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 |