X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-fpm-config.patch;h=da235fcfda104954b011fe695030848fecf9ceea;hb=fd89691893d5128642099735dfc2a15c35e655e4;hp=c392321eca83359053eba2b01bd156270d5c3d7a;hpb=2145ef2126854956fb897978f38cda33bdc6672c;p=packages%2Fphp.git

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index c392321..da235fc 100644
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -72,16 +72,16 @@
  			for (var i=0; i<ths.length; i++) {
 --- php7.0-7.0/sapi/fpm/Makefile.frag~	2015-05-21 17:57:06.000000000 +0300
 +++ php7.0-7.0/sapi/fpm/Makefile.frag	2015-05-23 11:01:51.383332821 +0300
-@@ -11,9 +11,9 @@
- 	@$(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 || :
-+	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
-+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
-+	@$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
- 
+@@ -14,9 +14,9 @@
+ 		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; \
++		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
+ 	fi
+ 	
  	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8