diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 03:59:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 03:59:13 -0700 |
| commit | bbe099e709d5c89eb638e190cc96dfb8bea5e887 (patch) | |
| tree | 1aab45f5c1c39fa580b72d36382c2f205c682938 | |
| parent | 54afd49976bbacd83516e5fc0cd22a2d17936419 (diff) | |
| download | emacs-bbe099e709d5c89eb638e190cc96dfb8bea5e887.tar.gz | |
* Makefile.in (bootstrap): Simplify build procedure.
Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index b4f74aea850..2b1b2f2915c 100644 --- 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 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 |