diff options
-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 |