diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-04 20:54:46 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-04 20:55:17 -0800 |
| commit | ec550cd783e9cac8715c1c88b56654b2819bc0ec (patch) | |
| tree | c3738c5fabde55a4f5af3c6623c14e4e61baaa2d | |
| parent | 97f894e1899ba9773b8c213b56d34b1f1a9b03d9 (diff) | |
| parent | eeae4651f72244f68a15e4be69a465b66b1661f7 (diff) | |
| download | php-git-ec550cd783e9cac8715c1c88b56654b2819bc0ec.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -12,6 +12,8 @@ . Fixed bug #68297 (Application Popup provides too few information). (Anatol) . Fixed bug #65769 (localeconv() broken in TS builds). (Anatol) . Fixed bug #65230 (setting locale randomly broken). (Anatol) + . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR / PHP_DATADIR + correctly). (Ferenc) . Fixed bug #68583 (Crash in timeout thread). (Anatol) . Fixed bug #65576 (Constructor from trait conflicts with inherited constructor). (dunglas at gmail dot com) diff --git a/configure.in b/configure.in index 2e3b375e6a..5c7c2e3493 100644 --- a/configure.in +++ b/configure.in @@ -1173,7 +1173,7 @@ case $libdir in libdir=$libdir/php ;; esac -case $datadir in +case `eval echo $datadir` in '${prefix}/share') datadir=$datadir/php ;; @@ -1188,7 +1188,7 @@ old_libdir=$libdir old_datadir=$datadir exec_prefix=`eval echo $exec_prefix` libdir=`eval echo $libdir` -datadir=`eval echo $datadir` +datadir=`eval eval echo $datadir` dnl Build extension directory path |