Skip to content

Commit 691726f

Browse files
committed
check both unexpanded and expanded path
1 parent d853899 commit 691726f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

configure.ac

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,10 +1311,14 @@ AS_VAR_IF([program_prefix], [NONE], [program_prefix=])
13111311
AS_VAR_IF([program_suffix], [NONE], [program_suffix=])
13121312

13131313
orig_libdir=$libdir
1314+
1315+
dnl First for unexpanded (default), second for expanded (from options)
13141316
AS_CASE([$libdir],
1315-
[${prefix}/${PHP_LIBDIR}], [libdir=$libdir/php])
1317+
['${exec_prefix}/lib'], [libdir=$libdir/php],
1318+
[${exec_prefix}/${PHP_LIBDIR}], [libdir=$libdir/php])
13161319

13171320
AS_CASE([$(eval echo $datadir)],
1321+
['${prefix}/share'], [datadir=$datadir/php],
13181322
[${prefix}/share], [datadir=$datadir/php])
13191323

13201324
phptempdir=$(pwd)/libs

0 commit comments

Comments
 (0)