* don't override $libdir and $datadir if they are specified on the

  commandline

diff --git a/configure.in b/configure.in
index 5205b4911260b9349f6889178a9212856c118187..3c34a5e24bf252e41dd28a39761589c7482afc73 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -698,12 +698,12 @@ phptempdir="`pwd`/libs"
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
 case $libdir in
-  */php) ;;
-  *) libdir="$libdir/php";;
+  '${exec_prefix}/lib') libdir="$libdir/php";;
+  *) ;;
 esac
 case $datadir in
-  */php) ;;
-  *) datadir="$datadir/php";;
+  '${prefix}/share') datadir="$datadir/php";;
+  *) ;;
 esac
 
 dnl Build extension directory path