X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/525d25e1c7e98987353bf0a7a92e43a3fe52043d..6ded9a6c2478d6c6d0605606003385406bbd61de:/bootstrap

diff --git a/bootstrap b/bootstrap
index a9ad671..460094f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,15 +1,30 @@
 #!/bin/sh
+#
+# Copyright © 2011-2012 Nick Bowler
+#
+# Simple script to get started from a fresh git checkout.
+#
+# License WTFPL2: Do What The Fuck You Want To Public License, version 2.
+# This is free software: you are free to do what the fuck you want to.
+# There is NO WARRANTY, to the extent permitted by law.
 
-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."
@@ -17,7 +32,10 @@ else
 	die "Gnulib sources are not properly installed in gnulib/."
 fi
 
-$PERL fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in -m m4/fix-gnulib.m4 \
+$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