X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f0d9cb41333a2930e73cd2e31e0c0aaa855ffd21..f4b59008c1616f860f35146237d29f476c56baa8:/bootstrap?ds=sidebyside

diff --git a/bootstrap b/bootstrap
index 94d0bc8..fdfd705 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,14 +1,22 @@
 #!/bin/sh
 
-trap 'exit 1' USR1
-die() { printf '%s\n' "$@" 1>&2; kill -USR1 $$; }
+scriptname=$0
+
+err() {
+	printf '%s: %s\n' "$scriptname" "$@" 1>&2
+}
+
+die() {
+	err "$@"
+	exit 1
+}
 
 : ${AUTORECONF=autoreconf}
 : ${GNULIB=gnulib}
 : ${GIT=git}
+: ${PERL=perl}
 
-$GIT submodule update --init \
-	|| echo "Failed to update Gnulib sources from git."
+$GIT submodule update --init || err "Failed to update submodules from git."
 
 if test -x $GNULIB/gnulib-tool; then
 	$GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
@@ -16,4 +24,7 @@ else
 	die "Gnulib sources are not properly installed in gnulib/."
 fi
 
+$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
+	|| die "Failed to fixup Gnulib makefile fragment."
+
 $AUTORECONF -fis