bootstrap: Rename 'bootstrap.sh' to 'bootstrap'.

Follow Gnulib's convention of using either "bootstrap" or "autogen.sh"
file names for development bootstrap scripts.

* bootstrap.sh: Rename to ...
* bootstrap: ... this.
* GNUmakefile (bootstrap): Adapt.
* HACKING: Likewise.
* Makefile.am (EXTRA_DIST): Likewise.
* doc/automake.texi (Future of aclocal)
(Error required file ltmain.sh not found): Likewise.
* maintainer/maint.mk (autodiffs, update-copyright): Likewise.

6 files changed, 10 insertions, 10 deletions

diff --git a/GNUmakefile b/GNUmakefile
index ebc38764c..aa52f603d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -72,7 +72,7 @@ configure-flags := $(old-configure-flags) $(BOOTSTRAP_CONFIGURE_FLAGS)
 
 .PHONY: bootstrap
 bootstrap:
-	cd $(srcdir) && $(SHELL) ./bootstrap.sh
+	cd $(srcdir) && $(SHELL) ./bootstrap
 	$(srcdir)/configure $(configure-flags)
 	$(MAKE) clean
 	$(MAKE) check TESTS=t/get-sysconf
diff --git a/HACKING b/HACKING
index 6ffc9ca15..e34870b84 100644
--- a/HACKING
+++ b/HACKING
@@ -149,7 +149,7 @@
 = Working with git
 
 * To regenerate dependent files created by aclocal and automake,
-  use the 'bootstrap.sh' script.  It uses the code from the source
+  use the 'bootstrap' script.  It uses the code from the source
   tree, so the resulting files (aclocal.m4 and Makefile.in) should
   be the same as you would get if you install this version of
   automake and use it to generate those files.  Be sure to have the
@@ -365,7 +365,7 @@
   in by hand any "TODO" left in there.
 
 * Update version number in configure.ac to next alpha number.
-  Re-run ./bootstrap.sh and commit.
+  Re-run ./bootstrap and commit.
 
 * Don't forget to "git push" your changes so they appear in the public
   git tree.
diff --git a/Makefile.am b/Makefile.am
index 529a0cf74..cfe4dd40d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ nodist_noinst_SCRIPTS =
 ## ------------ ##
 
 EXTRA_DIST += \
-  bootstrap.sh \
+  bootstrap \
   GNUmakefile \
   HACKING \
   PLANS
diff --git a/bootstrap.sh b/bootstrap
index 781627df6..781627df6 100755
--- a/bootstrap.sh
+++ b/bootstrap
diff --git a/doc/automake.texi b/doc/automake.texi
index b486c1c90..da0aa2942 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3857,12 +3857,12 @@ will have been taken care of.  If otherwise you used to call
 @command{aclocal} directly yourself or from some script, you will
 quickly notice the change.
 
-Many packages come with a script called @file{bootstrap.sh} or
+Many packages come with a script called @file{bootstrap} or
 @file{autogen.sh}, that will just call @command{aclocal},
 @command{libtoolize}, @command{gettextize} or @command{autopoint},
 @command{autoconf}, @command{autoheader}, and @command{automake} in
 the right order.  Actually this is precisely what @command{autoreconf}
-can do for you.  If your package has such a @file{bootstrap.sh} or
+can do for you.  If your package has such a @file{bootstrap} or
 @file{autogen.sh} script, consider using @command{autoreconf}.  That
 should simplify its logic a lot (less things to maintain, yum!), it's
 even likely you will not need the script anymore, and more to the point
@@ -5524,7 +5524,7 @@ performed automatically by Autoconf (@pxref{AC_LIBOBJ vs LIBOBJS, ,
 @cindex @command{libtoolize}, no longer run by @command{automake}
 @cindex @command{libtoolize} and @command{autoreconf}
 @cindex @command{autoreconf} and @command{libtoolize}
-@cindex @file{bootstrap.sh} and @command{autoreconf}
+@cindex @file{bootstrap} and @command{autoreconf}
 @cindex @file{autogen.sh} and @command{autoreconf}
 
 Libtool comes with a tool called @command{libtoolize} that will
@@ -5543,7 +5543,7 @@ functionality has been moved into the @command{autoreconf} command
 (@pxref{autoreconf Invocation, , Using @command{autoreconf}, autoconf,
 The Autoconf Manual}).  If you do not want to remember what to run and
 when, just learn the @command{autoreconf} command.  Hopefully,
-replacing existing @file{bootstrap.sh} or @file{autogen.sh} scripts by
+replacing existing @file{bootstrap} or @file{autogen.sh} scripts by
 a call to @command{autoreconf} should also free you from any similar
 incompatible change in the future.
 
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 100871f42..582cfdd58 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -223,7 +223,7 @@ autodiffs:
 	       && cd tmp \
 	       && $(GIT) checkout -q "$$rev" \
 	       && echo "$@: bootstrapping $$rev" \
-	       && $(SHELL) ./bootstrap.sh \
+	       && $(SHELL) ./bootstrap \
 	       && echo "$@: copying files from $$rev" \
 	       && makefile_ins=`find . -name Makefile.in` \
 	       && (tar cf - configure aclocal.m4 $$makefile_ins) | \
@@ -487,7 +487,7 @@ update-copyright:
 	    || { echo "$@: cannot get current year" >&2; exit 1; }; \
 	fi; \
 	sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
-	  bootstrap.sh configure.ac; \
+	  bootstrap configure.ac; \
 	excluded_re=`( \
 	  for url in $(FETCHFILES); do echo "$$url"; done \
 	    | sed -e 's!^.*/!!' -e 's!^.*=!!' -e 's!^!lib/!' \