* Makefile.in (bootstrap): Simplify build procedure.

Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.

diff --git a/ChangeLog b/ChangeLog
index b4f74aea85077aace3b58057cb50208b2fa08a68..2b1b2f2915c061beab7e53bd975e8726bd4708d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * Makefile.in (bootstrap): Simplify build procedure.
+       Suggested by Wolfgang Jenker in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
+
        Merge from gnulib, incorporating:
        2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
 

diff --git a/Makefile.in b/Makefile.in
index 7a38abeca1ca7dae9a76605ed484a79f85ef7ece..542c30bbab7e2d1499d7f4a99bc5c79ebcd10b0a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -889,18 +889,13 @@ dvi:
 .PHONY: bootstrap
 
 # Bootstrapping does the following:
-#  * Remove files to start from a clean slate.
+#  * Remove files to start from a bootstrap-clean slate.
 #  * Run autogen.sh, falling back on copy_autogen if autogen.sh fails.
-#  * Build Makefile, to build the build procedure itself.
+#  * Rebuild Makefile, to update the build procedure itself.
 #  * Do the actual build.
 bootstrap: bootstrap-clean FRC
        cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
-       if [ -x config.status ]; then \
-           ./config.status --recheck && \
-           ./config.status; \
-       else \
-           $(srcdir)/configure $(CONFIGURE_FLAGS); \
-       fi
+       $(MAKE) $(MFLAGS) Makefile
        $(MAKE) $(MFLAGS) info all
 
 .PHONY: check-declare