diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-08 10:15:59 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-08 10:15:59 +0000 |
| commit | c75fcd87a32bd11ad2734866f46818b89a59c113 (patch) | |
| tree | 9025c96387e3e76c4fcaec163a93074f280b2824 | |
| parent | d1231c9668ba360d87dc35db557cd93d1d772eae (diff) | |
| download | php-git-c75fcd87a32bd11ad2734866f46818b89a59c113.tar.gz | |
fix build without --prefix and make sure fpm_conf is recompiled every
time one changes --prefix
| -rw-r--r-- | sapi/fpm/Makefile.frag | 2 | ||||
| -rw-r--r-- | sapi/fpm/config.m4 | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index 83cc641939..4f99067397 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -3,6 +3,8 @@ fpm: $(SAPI_FPM_PATH) $(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS) $(BUILD_FPM) +$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h + install-build: install-fpm install-fpm: install-sapi diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index ba780295ff..dffc5c6ec7 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -534,6 +534,10 @@ AC_DEFUN([AC_FPM_VARS], php_fpm_conf_path="$PHP_FPM_CONF" fi + if test -z "$prefix" -o "$prefix" = "NONE"; then + prefix="/usr/local" + fi + if test -z "$php_fpm_conf_path"; then php_fpm_conf_path=`eval echo "$sysconfdir"` php_fpm_conf_path="$php_fpm_conf_path/php-fpm.conf" @@ -636,7 +640,7 @@ if test "$PHP_FPM" != "no"; then AC_FPM_CHECKS AC_FPM_CONF - PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fpm/Makefile.frag) + PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm]) SAPI_FPM_PATH=sapi/fpm/php-fpm PHP_SUBST(SAPI_FPM_PATH) |