Index: apkg-script-utils
===================================================================
RCS file: /pack/anoncvs/autopackage/main/share/apkg-script-utils,v
retrieving revision 1.225
diff -u -r1.225 apkg-script-utils
--- apkg-script-utils 2006/09/09 05:48:50 1.225
+++ apkg-script-utils 2006/09/13 00:51:24
@@ -156,6 +156,24 @@
fi
fi
+
+ local libtool_fixed
+ if [[ -f libtool ]]; then
+ trace Fixing libtool...
+ if [ -f "$autopackage_prefix/libexec/autopackage/fixlibtool" ]; then
+ # autopackage is installed
+ trace using installed directories and executing fixlibtool
+ bash "$autopackage_prefix/libexec/autopackage/fixlibtool" > libtool-fixed
+ elif [ -f "$autopackage_prefix/libexec/fixlibtool" ]; then
+ # autopackage is not installed
+ trace using cvs directories and executing fixlibtool
+ bash "$autopackage_prefix/libexec/fixlibtool" > libtool-fixed
+ else
+ warn fixlibtool could not be found.
+ fi
+ chmod +x libtool-fixed
+ libtool_fixed="`pwd`/libtool-fixed"
+ fi
if [[ "$APKG_BUILD_SKIP_MAKE" != "1" ]]; then
outn "$intl_MAKING";
@@ -167,9 +185,9 @@
if [[ "$APKG_BUILD_VERBOSE" != "0" ]]; then
echo
touch "$__apkg_errors_file"
- make
+ make LIBTOOL="$libtool_fixed"
else
- make >/dev/null 2>"$__apkg_errors_file"
+ make LIBTOOL="$libtool_fixed" >/dev/null 2>"$__apkg_errors_file"
fi
if [[ "$?" == "0" ]]; then
@@ -194,24 +212,6 @@
echo "" >"$__apkg_errors_file";
outn "$intl_INSTALLING" "$build_root";
- local libtool_fixed
- if [[ -f libtool ]]; then
- trace Fixing libtool...
- if [ -f "$autopackage_prefix/libexec/autopackage/fixlibtool" ]; then
- # autopackage is installed
- trace using installed directories and executing fixlibtool
- bash "$autopackage_prefix/libexec/autopackage/fixlibtool" > libtool-fixed
- elif [ -f "$autopackage_prefix/libexec/fixlibtool" ]; then
- # autopackage is not installed
- trace using cvs directories and executing fixlibtool
- bash "$autopackage_prefix/libexec/fixlibtool" > libtool-fixed
- else
- warn fixlibtool could not be found.
- fi
- chmod +x libtool-fixed
- libtool_fixed="`pwd`/libtool-fixed"
- fi
-
local installcmd="/usr/bin/install"
# optimize install: don't use the abi-install program if there are no patches