Fix bootstrapping with recent bits.

[upkg.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 4304be0f5dccc8517357ec0dc8977e9d4d7343ca..d7e5087db43f9784761cb01796a426534999d897 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 2011-2012 Nick Bowler
+# Copyright © 2011-2012, 2015 Nick Bowler
 #
 # Simple script to get started from a fresh git checkout.
 #
@@ -36,9 +36,18 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 
+# Frustratingly, libtoolize has changed the name of its nonrecursive ltdl
+# makefile output, which broke all packages depending on previous documented
+# behaviour.  Work around the issue by renaming the output.
+rm -f libltdl/ltdl.mk
 $LIBTOOLIZE -f || die "Failed to run libtoolize."
+test ! -f libltdl/Makefile.inc || mv -f libltdl/Makefile.inc libltdl/ltdl.mk.in
+test ! -f libltdl/ltdl.mk || mv -f libltdl/ltdl.mk libltdl/ltdl.mk.in
 
-$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/Makefile.inc \
+$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/ltdl.mk.in \
        || die "Failed to fixup libltdl 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
 LIBTOOLIZE=true $AUTORECONF -fis