]> granicus.if.org Git - php/commitdiff
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
authorFerenc Kovacs <tyrael@php.net>
Sat, 3 Jan 2015 18:18:07 +0000 (19:18 +0100)
committerFerenc Kovacs <tyrael@php.net>
Sat, 3 Jan 2015 18:18:07 +0000 (19:18 +0100)
configure.in

index 358b94d37bfd126fbfe030e9454fbc42166d79ac..10456d19f0f4363d27ab2f2cebed43699e2cd45e 100644 (file)
@@ -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