From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 15 Aug 2012 00:34:44 +0000 (-0400)
Subject: Workaround Gentoo's silly Automake wrapper in bootstrap.
X-Git-Tag: v1~38
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/3d33bb813cb3ec6e086fc2b791e2992512b13a9a

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 557a9a4..460094f 100755
--- 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."
 
+# 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