| 1 |
commit: 8cfe3c367df66bcb27cab3868190de3a18538fff |
| 2 |
Author: Michael Orlitzky <michael <AT> orlitzky <DOT> com> |
| 3 |
AuthorDate: Wed Jul 19 13:55:54 2017 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 19 13:55:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=8cfe3c36 |
| 7 |
|
| 8 |
php-fpm.example.init.in: use @SYSCONFDIR@ from autotools. |
| 9 |
|
| 10 |
Makefile.am | 9 +++++---- |
| 11 |
doc/php-fpm.example.init.in | 2 +- |
| 12 |
2 files changed, 6 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/Makefile.am b/Makefile.am |
| 15 |
index 578062e..eb3b89b 100644 |
| 16 |
--- a/Makefile.am |
| 17 |
+++ b/Makefile.am |
| 18 |
@@ -12,19 +12,20 @@ if APACHE2 |
| 19 |
nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf |
| 20 |
endif |
| 21 |
|
| 22 |
-# The next few rules allow us to replace bindir, libdir, and |
| 23 |
-# localstatedir within our script and conf file. The example is taken |
| 24 |
+# The next few rules allow us to replace bindir, libdir, etc. |
| 25 |
+# within our script and conf file. The example is taken |
| 26 |
# from the autoconf documentation and can be found in the |
| 27 |
# "Installation Directory Variables" section. |
| 28 |
edit = sed -e 's|@BINDIR[@]|$(bindir)|g' \ |
| 29 |
-e 's|@LIBDIR[@]|$(libdir)|g' \ |
| 30 |
- -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' |
| 31 |
+ -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ |
| 32 |
+ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' |
| 33 |
|
| 34 |
$(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_DATA): Makefile |
| 35 |
rm -f $@ $@.tmp |
| 36 |
srcdir=''; \ |
| 37 |
test -f ./$@.in || srcdir=$(srcdir)/; \ |
| 38 |
- $(edit) $${srcdir}$@.in > $@.tmp |
| 39 |
+ $(edit) $${srcdir}$@.in > $@.tmp |
| 40 |
mv $@.tmp $@ |
| 41 |
|
| 42 |
$(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in |
| 43 |
|
| 44 |
diff --git a/doc/php-fpm.example.init.in b/doc/php-fpm.example.init.in |
| 45 |
index 7969b71..912a5d8 100644 |
| 46 |
--- a/doc/php-fpm.example.init.in |
| 47 |
+++ b/doc/php-fpm.example.init.in |
| 48 |
@@ -11,7 +11,7 @@ set_phpvars() { |
| 49 |
PHP_FPM_PID="/run/php-fpm.pid" |
| 50 |
fi |
| 51 |
|
| 52 |
- PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" |
| 53 |
+ PHP_FPM_CONF="@SYSCONFDIR@/php/fpm-${PHPSLOT}/php-fpm.conf" |
| 54 |
PHP_FPM_BIN="@LIBDIR@/${PHPSLOT}/bin/php-fpm" |
| 55 |
} |
Archives