fix build without --prefix and make sure fpm_conf is recompiled every

tony2001 · tony2001 · commit c75fcd87a32b · 2009-12-08T10:15:59.000Z
time one changes --prefix
diff --git 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
@@ -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)
