php: fix patch

This commit is contained in:
Enno Boland 2017-04-16 00:02:45 +02:00
parent 9ae32ca4ee
commit 20ae303f54
1 changed files with 12 additions and 12 deletions

View File

@ -1,13 +1,13 @@
--- ./sapi/fpm/Makefile.frag.orig 2016-02-28 18:32:56.357946535 -0500
+++ ./sapi/fpm/Makefile.frag 2016-02-28 18:33:05.809945555 -0500
@@ -12,8 +12,8 @@
@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 || :
+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
+ @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf || :
--- sapi/fpm/Makefile.frag.orig 2017-04-15 23:58:56.965737425 +0200
+++ sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200
@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
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; \
+ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
+ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
fi
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8