X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/a61ef9840185c6513f3e8fa8dd7f2f72c6369b95..e7b2e067cd007f12227af623649a8e9204a352b1:/bootstrap

diff --git a/bootstrap b/bootstrap
index f0e1d0d..a9ad671 100755
--- 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 -S || 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 -m m4/fix-gnulib.m4 \
+	|| die "Failed to fixup Gnulib makefile fragment."
+
+$AUTORECONF -fis