diff options
| -rw-r--r-- | configure.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.in b/configure.in index a07fe9a546..a63e856929 100644 --- a/configure.in +++ b/configure.in @@ -479,8 +479,12 @@ PHP_ARG_WITH(config-file-path,[path to configuration file], if test "x$PHP_CONFIG_FILE_PATH" = "xDEFAULT"; then case $PHP_LAYOUT in - GNU) PHP_CONFIG_FILE_PATH="$sysconfdir";; - *) PHP_CONFIG_FILE_PATH="$libdir";; + GNU) + PHP_CONFIG_FILE_PATH="$sysconfdir" + oldstyleextdir=no;; + *) + PHP_CONFIG_FILE_PATH="$libdir" + oldstyleextdir=yes;; esac fi @@ -710,13 +714,10 @@ LIBS="" test "$prefix" = "NONE" && prefix="/usr/local" test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' + case $libdir in '${exec_prefix}/lib') libdir="$libdir/php" - oldstyleextdir=yes - ;; - *) - oldstyleextdir=no ;; esac case $datadir in |