X-Git-Url: https://git.draconx.ca/gitweb/slotifier.git/blobdiff_plain/e89bebee19d3c919f3d501999fc38867cdcd2b00..e34a0aee1e615ef1153a7a80106455936b4d41f3:/bootstrap diff --git a/bootstrap b/bootstrap index f92c1c7..7bb1f8d 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright © 2011-2012, 2021 Nick Bowler +# Copyright © 2011-2012, 2015, 2021-2023 Nick Bowler # # Simple script to get started from a fresh git checkout. # @@ -22,7 +22,8 @@ die () { err "$@"; exit 1; } $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." + $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib." + $GNULIB/gnulib-tool --copy-file -S build-aux/config.rpath config.rpath else err "Gnulib sources are not properly installed in $GNULIB/" cat >&2 <<'EOF' @@ -39,8 +40,8 @@ EOF exit 1 fi -$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in || - die "Failed to fixup Gnulib makefile fragment." +$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \ + || die "Failed to fixup Gnulib makefile fragment." # Rewrite if ! ... construts produced by gnulib conditional dependencies # as these fail in heirloom-sh.