Make fix-gnulib only need a single output file.

[cdecl99.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index fa1358073f117d8e74a9a6bc34d73f44d103d14d..1362e25ceda5da2373334d2c8608ac701a5fd5a0 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -3,11 +3,21 @@
 trap 'exit 1' USR1
 die() { printf '%s\n' "$@" 1>&2; kill -USR1 $$; }
 
-git submodule update --init || echo "Failed to update Gnulib sources from git."
-if test -x gnulib/gnulib-tool; then
-       gnulib/gnulib-tool --update || die "Failed to update Gnulib."
+: ${AUTORECONF=autoreconf}
+: ${GNULIB=gnulib}
+: ${GIT=git}
+: ${PERL=perl}
+
+$GIT submodule update --init \
+       || echo "Failed to update Gnulib sources from git."
+
+if test -x $GNULIB/gnulib-tool; then
+       $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
 else
        die "Gnulib sources are not properly installed in gnulib/."
 fi
 
-autoreconf -fis
+$PERL fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
+       || die "Failed to fixup Gnulib makefile fragment."
+
+$AUTORECONF -fis