]>
Commit | Line | Data |
---|---|---|
562f6a1b ER |
1 | --- php-5.4.6/scripts/phpize.in~ 2012-08-23 03:02:42.000000000 +0300 |
2 | +++ php-5.4.6/scripts/phpize.in 2012-08-23 10:16:37.011306948 +0300 | |
3 | @@ -6,10 +6,16 @@ | |
4 | exec_prefix="`eval echo @exec_prefix@`" | |
5 | phpdir="`eval echo @libdir@`/php/build" | |
6 | includedir="`eval echo @includedir@`/php" | |
7 | +aclocaldir="$prefix/share/aclocal" | |
c0240cb1 | 8 | builddir="`pwd`" |
9 | SED="@SED@" | |
10 | ||
11 | -FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" | |
562f6a1b ER |
12 | +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool" |
13 | +if [ -f "$aclocaldir/ltsugar.m4" ]; then | |
14 | + LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4" | |
15 | +else | |
16 | + LIBTOOL_FILES="libtool.m4" | |
17 | +fi | |
c0240cb1 | 18 | FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" |
19 | CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ | |
20 | mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ | |
562f6a1b ER |
21 | @@ -145,8 +151,9 @@ phpize_copy_files() |
22 | test -d build || mkdir build | |
c0240cb1 | 23 | |
24 | (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) | |
562f6a1b | 25 | + (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build) |
c0240cb1 | 26 | (cd "$phpdir" && cp $FILES "$builddir") |
27 | - (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) | |
562f6a1b | 28 | + (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4) |
c0240cb1 | 29 | } |
30 | ||
31 | phpize_replace_prefix() |