Patch no-clobber-php-fpm-conf for *Compile Issues Bug #74138

Patch version 2017-02-21 02:00 UTC

Obsolete patches:

• no-clobber-php-fpm-conf, revision 2017-02-21 01:58 UTC

• 2017-02-21 02:00 UTC [diff to current]
• 2017-02-21 01:58 UTC [diff to current]
• 2017-02-21 01:18 UTC [diff to current]
• 2017-02-21 01:17 UTC [diff to current]
• 2017-02-21 01:14 UTC [diff to current]
• 2017-02-21 00:51 UTC [diff to current]

Developer: coenraad@wish.org.za

+++ sapi/fpm/Makefile.frag	2017-02-20 20:57:19.887742000 -0500
@@ -10,10 +10,14 @@
 	@$(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