diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-14 11:57:21 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-14 11:57:21 +0000 |
| commit | a7662039da69b11374529c046006c593df10c630 (patch) | |
| tree | 7fc4ec4b9d58b00960f644074e7069409dd60c30 | |
| parent | 7384cdf3380cc3b5a9fb6dbfd86c6a55a191570b (diff) | |
| download | php-git-a7662039da69b11374529c046006c593df10c630.tar.gz | |
drop conf/ and man/
simplify config.m4 a bit
fix exec_prefix issue
| -rw-r--r-- | sapi/fpm/Makefile.frag | 2 | ||||
| -rw-r--r-- | sapi/fpm/config.m4 | 21 | ||||
| -rw-r--r-- | sapi/fpm/init.d.php-fpm.in (renamed from sapi/fpm/conf/init.d.php-fpm.in) | 0 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.1.in (renamed from sapi/fpm/man/php-fpm.1.in) | 0 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.conf.in (renamed from sapi/fpm/conf/php-fpm.conf.in) | 0 |
5 files changed, 5 insertions, 18 deletions
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index 4f99067397..5a228167f6 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -17,7 +17,7 @@ install-fpm: install-sapi @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(php_fpm_conf_dir)/" && \ $(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_conf_dir) || : - @$(INSTALL_DATA) sapi/fpm/conf/php-fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_dir)/php-fpm.conf.default || : + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_dir)/php-fpm.conf.default || : @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index f8073c9bb1..a100b06340 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -539,7 +539,7 @@ AC_DEFUN([AC_FPM_VARS], fi if test -z "$exec_prefix" -o "$exec_prefix" = "NONE"; then - exec_prefix="/usr/local" + exec_prefix=`eval echo "$prefix"` fi php_fpm_bin_path=`eval echo "$bindir"` @@ -606,21 +606,6 @@ AC_DEFUN([AC_FPM_VARS], ]) - -AC_DEFUN([AC_FPM_OUTPUT], -[ - PHP_OUTPUT(sapi/fpm/conf/php-fpm.conf:sapi/fpm/conf/php-fpm.conf.in) - PHP_OUTPUT(sapi/fpm/conf/init.d.php-fpm:sapi/fpm/conf/init.d.php-fpm.in) - PHP_OUTPUT(sapi/fpm/php-fpm.1:sapi/fpm/man/php-fpm.1.in) -]) - - -AC_DEFUN([AC_FPM_CONF], -[ - AC_FPM_ARGS - AC_FPM_VARS - AC_FPM_OUTPUT -]) dnl }}} @@ -646,8 +631,10 @@ if test "$PHP_FPM" != "no"; then ]) AC_FPM_CHECKS - AC_FPM_CONF + AC_FPM_ARGS + AC_FPM_VARS + PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.1) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm]) SAPI_FPM_PATH=sapi/fpm/php-fpm diff --git a/sapi/fpm/conf/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in index a0175eeebc..a0175eeebc 100644 --- a/sapi/fpm/conf/init.d.php-fpm.in +++ b/sapi/fpm/init.d.php-fpm.in diff --git a/sapi/fpm/man/php-fpm.1.in b/sapi/fpm/php-fpm.1.in index 2f534dd45f..2f534dd45f 100644 --- a/sapi/fpm/man/php-fpm.1.in +++ b/sapi/fpm/php-fpm.1.in diff --git a/sapi/fpm/conf/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index b637ab84e0..b637ab84e0 100644 --- a/sapi/fpm/conf/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in |