Kill off the silly trap handler while we're at it, because it never
actually worked properly. Just don't call die from a subshell.
#!/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 submodules 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."