com php-src: Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly: configu re.in
| From: | Stanislav Malyshev | Date: | Sat, 03 Jan 2015 18:18:07 +0000 |
| Subject: | com php-src: Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly: configu re.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83981@lists.php.net to get a copy of this message | ||
Commit: 83db77532398f4c9da7625ffb42de4a6ece9c20f
Author: Ferenc Kovacs <tyrael@php.net> Sat, 3 Jan 2015 19:18:07 +0100
Parents: 244fc1e05367dc7ebdf2db260c8bc8b106563d26
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=83db77532398f4c9da7625ffb42de4a6ece9c20f
Log:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Bugs:
https://bugs.php.net/66764
Changed paths:
M configure.in
Diff:
diff --git a/configure.in b/configure.in
index 358b94d..10456d1 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