(LP: #438619) /usr/local/bin/php5-fpm: not found

dreamcat4 · Sep 29, 2009 · 7360f27 · 7360f27
1 parent 57ed12e
commit 7360f27
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/ac/fpm_conf.m4 b/ac/fpm_conf.m4
@@ -37,6 +37,10 @@ AC_DEFUN([AC_FPM_VARS],
 		exec_prefix=$fpm_prefix
 	fi
 
+	if test `echo "$bindir" | grep "exec_prefix"` ; then
+		bindir=$exec_prefix/bin
+	fi
+
 	fpm_bin_prefix=$fpm_prefix/bin
 	if test $bindir != "NONE" -a $bindir != "" -a $bindir != "no" ; then
 		fpm_bin_prefix=$bindir

diff --git a/acinclude.m4 b/acinclude.m4
@@ -410,6 +410,10 @@ AC_DEFUN([AC_FPM_PATHS],
 		exec_prefix=$fpm_prefix
 	fi
 
+	if test `echo "$bindir" | grep "exec_prefix"` ; then
+		bindir=$exec_prefix/bin
+	fi
+
 	fpm_bin_prefix=$fpm_prefix/bin
 	if test $bindir != "NONE" -a $bindir != "" -a $bindir != "no" ; then
 		fpm_bin_prefix=$bindir

diff --git a/configure b/configure
@@ -20560,6 +20560,10 @@ fi;
 		exec_prefix=$fpm_prefix
 	fi
 
+	if test `echo "$bindir" | grep "exec_prefix"` ; then
+		bindir=$exec_prefix/bin
+	fi
+
 	fpm_bin_prefix=$fpm_prefix/bin
 	if test $bindir != "NONE" -a $bindir != "" -a $bindir != "no" ; then
 		fpm_bin_prefix=$bindir