smartcoder
diff --git a/‎sapi/fpm/Makefile.frag
Lines changed: 1 addition & 1 deletion b/‎sapi/fpm/Makefile.frag
Lines changed: 1 addition & 1 deletion
diff --git a/‎sapi/fpm/config.m4
Lines changed: 4 additions & 17 deletions b/‎sapi/fpm/config.m4
Lines changed: 4 additions & 17 deletions
diff --git a/‎sapi/fpm/conf/init.d.php-fpm.in renamed to ‎sapi/fpm/init.d.php-fpm.in b/‎sapi/fpm/conf/init.d.php-fpm.in renamed to ‎sapi/fpm/init.d.php-fpm.in
diff --git a/‎sapi/fpm/man/php-fpm.1.in renamed to ‎sapi/fpm/php-fpm.1.in b/‎sapi/fpm/man/php-fpm.1.in renamed to ‎sapi/fpm/php-fpm.1.in
diff --git a/‎sapi/fpm/conf/php-fpm.conf.in renamed to ‎sapi/fpm/php-fpm.conf.in b/‎sapi/fpm/conf/php-fpm.conf.in renamed to ‎sapi/fpm/php-fpm.conf.in
@@ -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
 
@@ -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