diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-12-25 15:41:56 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-12-25 15:41:56 +0000 |
| commit | 9f76195869eb433073718b4ced138510aca0c2d5 (patch) | |
| tree | e1092310884beffc9518ffb0ed3adacf2220cdc1 | |
| parent | 601f4cd12968fefab1fdc474e582271582f19654 (diff) | |
| download | php-git-9f76195869eb433073718b4ced138510aca0c2d5.tar.gz | |
MFH: fix bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install path)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 12 insertions, 0 deletions
@@ -22,6 +22,8 @@ PHP NEWS - Fixed bug #39903 (Notice message when executing __halt_compiler() more than once). (Tony) - Fixed bug #39898 (FILTER_VALIDATE_URL validates \r\n\t etc). (Ilia) +- Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR + install path). (Tony) - Fixed bug #39884 (ReflectionParameter::getClass() throws exception for type hint self). (thekid at php dot net) - Fixed bug #39873 (number_format() breaks with locale & decimal points). diff --git a/configure.in b/configure.in index 47065dc6ad..885beba409 100644 --- a/configure.in +++ b/configure.in @@ -1100,6 +1100,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_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR` EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` @@ -1191,6 +1200,7 @@ PHP_SUBST(phptempdir) PHP_SUBST(prefix) PHP_SUBST(localstatedir) PHP_SUBST(datadir) +PHP_SUBST(datarootdir) PHP_SUBST(sysconfdir) PHP_SUBST(EXEEXT) |