diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-04 20:46:40 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-04 20:54:29 -0800 |
| commit | eeae4651f72244f68a15e4be69a465b66b1661f7 (patch) | |
| tree | 9d876e9e9f9ed5e7a2bfa799b86df36dd3575844 | |
| parent | 5639c3350e2d33b7e8f4b3c792f998aad08c293a (diff) | |
| parent | 83db77532398f4c9da7625ffb42de4a6ece9c20f (diff) | |
| download | php-git-eeae4651f72244f68a15e4be69a465b66b1661f7.tar.gz | |
Merge branch 'pull-request/975' into PHP-5.5
* pull-request/975:
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
@@ -13,6 +13,8 @@ PHP NEWS . 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 #68594 (Use after free vulnerability in unserialize()). (CVE-2014-8142) (Stefan Esser) diff --git a/configure.in b/configure.in index 358b94d37b..10456d19f0 100644 --- a/configure.in +++ b/configure.in @@ -1170,7 +1170,7 @@ case $libdir in libdir=$libdir/php ;; esac -case $datadir in +case `eval echo $datadir` in '${prefix}/share') datadir=$datadir/php ;; @@ -1185,7 +1185,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 |