Finally, coreutils' bootstrap will become an identical
copy of the one in gnulib, once this change migrates into
gnulib's version. I'm using this new bootstrap_epilogue
function in an upcoming patch, too.
>From 30c65cd49c98e56b65beef8812a4a25df4b1178a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Sat, 26 Sep 2009 14:13:16 +0200
Subject: [PATCH] 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.
---
bootstrap | 9 ++++-----
bootstrap.conf | 8 ++++++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/bootstrap b/bootstrap
index 138239d..6957ea3 100755
--- 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 f648e22..726092c 100644
--- 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
+}
--
1.6.5.rc2.177.ga9dd6
