From: Paul Eggert Date: Sat, 22 Sep 2012 10:59:13 +0000 (-0700) Subject: * Makefile.in (bootstrap): Simplify build procedure. X-Git-Tag: emacs-24.2.90~261 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbe099e709d5c89eb638e190cc96dfb8bea5e887;p=emacs.git * Makefile.in (bootstrap): Simplify build procedure. Suggested by Wolfgang Jenker in . --- diff --git a/ChangeLog b/ChangeLog index b4f74aea850..2b1b2f2915c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-09-22 Paul Eggert + * Makefile.in (bootstrap): Simplify build procedure. + Suggested by Wolfgang Jenker in + . + 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 7a38abeca1c..542c30bbab7 100644 --- 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