Workaround Gentoo's silly Automake wrapper in bootstrap.

It's pretty annoying when running bootstrap doesn't actually rebuild
using newly-installed tool versions.  This happens because Gentoo's
automake wrapper script detects that stuff has been previously built
with a particular version of Automake, and runs that instead of the
latest.

Since we're going to recreate them anyway, delete the generated files so
that Gentoo's script picks the latest.

diff --git a/bootstrap b/bootstrap
index 557a9a46c8a8f22e5c78ff6089cd109276a80b57..460094faeb31f30c414193311508dfc0ba666481 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -35,4 +35,7 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 

+# Punt some automake-generated files so that Gentoo's wrapper script doesn't
+# try to detect the automake version in use.
+rm -f Makefile.in aclocal.m4

 $AUTORECONF -fis
 $AUTORECONF -fis