diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | HACKING | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | bootstrap.sh (renamed from bootstrap) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index dcaaf01a6..06766187d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -51,7 +51,7 @@ endif # Must be phony, not to be confused with the 'bootstrap' script. .PHONY: bootstrap bootstrap: - $(AM_V_BOOTSTRAP)$(am__cd) $(srcdir) && ./bootstrap + $(AM_V_BOOTSTRAP)$(am__cd) $(srcdir) && ./bootstrap.sh $(AM_V_CONFIGURE)set -e; \ am__bootstrap_configure () { \ $(srcdir)/configure $${1+"$$@"} $(BOOTSTRAP_CONFIGURE_FLAGS); \ @@ -96,7 +96,7 @@ = Working with git * To regenerate dependent files created by aclocal and automake, - use the 'bootstrap' script. It uses the code from the source + use the 'bootstrap.sh' 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 @@ -231,7 +231,7 @@ distinguish net and repo versions.) * Run this: - ./bootstrap && ./configure && make && make check && make distcheck + ./bootstrap.sh && ./configure && make && make check && make distcheck * Run "make git-tag-release". This will run the maintainer checks, check that the NEWS file is @@ -248,7 +248,7 @@ use "make GNUPLOADFLAGS='--user KEY' git-upload-release". * Update version number in configure.ac to next alpha number. - Re-run ./bootstrap and commit. + Re-run ./bootstrap.sh 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 27b3fa022..37b44cf59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,7 +67,7 @@ TAGS_FILES = $(AUTOMAKESOURCES) EXTRA_DIST += \ $(AUTOMAKESOURCES) \ - bootstrap \ + bootstrap.sh \ GNUmakefile \ syntax-checks.mk \ HACKING @@ -742,7 +742,7 @@ autodiffs: && $(am__cd) tmp \ && $(GIT) checkout -q "$$rev" \ && echo "$@: bootstrapping $$rev" \ - && $(SHELL) ./bootstrap \ + && $(SHELL) ./bootstrap.sh \ && echo "$@: copying files from $$rev" \ && makefile_ins=`find . -name Makefile.in` \ && (tar cf - configure aclocal.m4 $$makefile_ins) | \ diff --git a/bootstrap b/bootstrap.sh index 1cede01aa..1cede01aa 100755 --- a/bootstrap +++ b/bootstrap.sh |