summaryrefslogtreecommitdiff
path: root/build-aux/bootstrap
diff options
context:
space:
mode:
authorMatthew Booth <mbooth@redhat.com>2011-03-03 22:15:13 +0100
committerJim Meyering <meyering@redhat.com>2011-03-03 22:15:13 +0100
commit329c5b59c9ebfed10f51859a5d16fbe080835a24 (patch)
tree81a693619fdfc1bf8a8258944c03040a46eed455 /build-aux/bootstrap
parentc2090a84dc3997acada3166772afac94f2d3a25c (diff)
downloadgnulib-329c5b59c9ebfed10f51859a5d16fbe080835a24.tar.gz
bootstrap: honor m4_base when running aclocal
* build-aux/bootstrap: Fix hard-coded use of m4 directory name.
Diffstat (limited to 'build-aux/bootstrap')
-rwxr-xr-xbuild-aux/bootstrap6
1 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e9ec11ea43..f004ad3260 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2011-01-21.16; # UTC
+scriptversion=2011-03-03.12; # UTC
# Bootstrap this package from checked-out sources.
@@ -874,7 +874,7 @@ grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
for command in \
libtool \
- "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
+ "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \
"${AUTOCONF-autoconf} --force" \
"${AUTOHEADER-autoheader} --force" \
"${AUTOMAKE-automake} --add-missing --copy --force-missing"
@@ -885,7 +885,7 @@ do
command="${LIBTOOLIZE-libtoolize} -c -f"
fi
echo "$0: $command ..."
- $command || exit
+ eval "$command" || exit
done