diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-04 20:55:25 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-04 20:55:25 -0800 |
| commit | e6e0b51db9c7618bde4e569177754f513d694cb6 (patch) | |
| tree | d36c53d6db766641cce6d88dc72152dd560f48a1 /configure.in | |
| parent | 75e042e57ada519caf9e6f53cf645ffeae5190aa (diff) | |
| parent | ec550cd783e9cac8715c1c88b56654b2819bc0ec (diff) | |
| download | php-git-e6e0b51db9c7618bde4e569177754f513d694cb6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index bf770dddc7..680e28191a 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 |