Mercurial > hg > octave-lyh > gnulib-hg
changeset 14405:6b613ec494cf
bootstrap: honor m4_base when running aclocal
* build-aux/bootstrap: Fix hard-coded use of m4 directory name.
author | Matthew Booth <mbooth@redhat.com> |
---|---|
date | Thu, 03 Mar 2011 22:15:13 +0100 |
parents | a70426a67033 |
children | 8d1ec7b0bc4d |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-03 Matthew Booth <mbooth@redhat.com> + + bootstrap: honor m4_base when running aclocal + * build-aux/bootstrap: Fix hard-coded use of m4 directory name. + 2011-03-02 Jim Meyering <meyering@redhat.com> getopt-gnu: relax license from LGPLv3+ to LGPLv2+
--- 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 @@ 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 @@ command="${LIBTOOLIZE-libtoolize} -c -f" fi echo "$0: $command ..." - $command || exit + eval "$command" || exit done