Trivial manual fixes.

[slotifier.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index f92c1c763439c3f742f47ec7bcb677d6da42e874..4aff9de1b4b19b5eb9d1a6d87629990918ae3ce2 100755 (executable)
--- 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,14 +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."
-
-# Rewrite if ! ... construts produced by gnulib conditional dependencies
-# as these fail in heirloom-sh.
-sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \
-  m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit
-mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit
+$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.