1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
|
From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Date: Sat, 2 May 2015 10:26:51 +0200
Subject: libtool2.2
---
scripts/phpize.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/phpize.in b/scripts/phpize.in
index 7d86b2e..2f468ee 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -9,8 +9,10 @@ includedir="$prefix/include/php/@DEBIAN_PHP_API@"
builddir="`pwd`"
SED="@SED@"
-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
+aclocaldir="$prefix/share/aclocal"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
+LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
@@ -145,8 +147,9 @@ phpize_copy_files()
test -d build || mkdir build
(cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
+ (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build)
(cd "$phpdir" && cp $FILES "$builddir")
- (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
+ (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4)
}
phpize_replace_prefix()
|