allow renaming bootstrap, and change the name of bootstrap.conf accordingly

2008-10-02  Paolo Bonzini  <bonzini@gnu.org>

	* build-aux/bootstrap: Allow renaming bootstrap, and change the
	name of bootstrap.conf accordingly.

diff --git a/ChangeLog b/ChangeLog
index 6ead2fe8e9aecfb1b163530c6f70a908fdba3441..59e9bd044a4ee4871f9e5e8998a9ce521974350f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-02  Paolo Bonzini  <bonzini@gnu.org>
+
+       * build-aux/bootstrap: Allow renaming bootstrap, and change the
+       name of bootstrap.conf accordingly.
+
 2008-10-02  Paolo Bonzini  <bonzini@gnu.org>
 
        * build-aux/bootstrap: Install git-merge-changelog configuration

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 93fe859ef0a67755f78870db08d019a04d17e894..1134a65180268a89f3ef92c54364db8fa1218605 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -49,7 +49,7 @@ Options:
                           not to have been checked out.
  --skip-po                Do not download po files.
 
-If the file bootstrap.conf exists in the current working directory, its
+If the file $0.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
@@ -146,7 +146,13 @@ copy=false
 vc_ignore=auto
 
 # Override the default configuration, if necessary.
-test -r bootstrap.conf && . ./bootstrap.conf
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+  */*) test -r "$0.conf" && . "$0.conf" ;;
+  *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
 
 if test "$vc_ignore" = auto; then
   vc_ignore=