From: Antony Dovgal Date: Mon, 25 Dec 2006 15:40:14 +0000 (+0000) Subject: fix bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install path) X-Git-Tag: RELEASE_1_0_0RC1~516 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fd11f3d26ceb41becdc30be924820ea2a3cc1e9;p=php fix bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install path) --- diff --git a/configure.in b/configure.in index 5e2efd5b0b..41c1e22a18 100644 --- a/configure.in +++ b/configure.in @@ -1052,6 +1052,15 @@ if test -z "$EXTENSION_DIR"; then fi fi +case $PHP_LAYOUT in + GNU) + datarootdir=$prefix/share + ;; + *) + datarootdir=$prefix/php + ;; +esac + dnl Expand all directory names for use in macros/constants EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` @@ -1141,6 +1150,7 @@ PHP_SUBST(phptempdir) PHP_SUBST(prefix) PHP_SUBST(localstatedir) PHP_SUBST(datadir) +PHP_SUBST(datarootdir) PHP_SUBST(sysconfdir) PHP_SUBST(EXEEXT)