maint: factor coreutils-specific code out of bootstrap

* bootstrap (bootstrap_epilogue): Define a default, empty function.
Remove coreutils-specific code, and instead,
invoke this new function at the end of this script.
* bootstrap.conf (bootstrap_epilogue): Define, to override the default.

diff --git a/bootstrap b/bootstrap
index 138239d12fdf72cc5d9da37ed1000eb15cac8581..6957ea3b645871d635723cc7cce0c58f46417349 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -70,6 +70,9 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+# A function to be called after everything else in this script.
+bootstrap_epilogue() { :; }
+
 # The command to download all .po files for a specified domain into
 # a specified directory.  Fill in the first %s is the domain name, and
 # the second with the destination directory.  Use rsync's -L and -r
@@ -801,10 +804,6 @@ if test $with_gettext = yes; then
   fi
 fi
 
-# Horrible, coreutils-specific kludges.
-# Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
-m=gnulib-tests/gnulib.mk
-sed 's,\.\./\.\.,..,g' $m > $m-t
-mv -f $m-t $m
+bootstrap_epilogue
 
 echo "$0: done.  Now you can run './configure'."

diff --git a/bootstrap.conf b/bootstrap.conf
index f648e226af97d6d45a5432ca3c68ca9fe5a6c0da..726092c7f27e71e9f6d4aa348dd3874642ec7ce9 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -319,3 +319,11 @@ tar        -
 
 # Automake requires that ChangeLog exist.
 touch ChangeLog || exit 1
+
+bootstrap_epilogue()
+{
+  # Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
+  m=gnulib-tests/gnulib.mk
+  sed 's,\.\./\.\.,..,g' $m > $m-t
+  mv -f $m-t $m
+}