aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-09-22 03:59:13 -0700
committerPaul Eggert2012-09-22 03:59:13 -0700
commitbbe099e709d5c89eb638e190cc96dfb8bea5e887 (patch)
tree1aab45f5c1c39fa580b72d36382c2f205c682938
parent54afd49976bbacd83516e5fc0cd22a2d17936419 (diff)
downloademacs-bbe099e709d5c89eb638e190cc96dfb8bea5e887.tar.gz
emacs-bbe099e709d5c89eb638e190cc96dfb8bea5e887.zip
* 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--ChangeLog4
-rw-r--r--Makefile.in11
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 @@
12012-09-22 Paul Eggert <eggert@cs.ucla.edu> 12012-09-22 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * Makefile.in (bootstrap): Simplify build procedure.
4 Suggested by Wolfgang Jenker in
5 <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
6
3 Merge from gnulib, incorporating: 7 Merge from gnulib, incorporating:
4 2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases 8 2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
5 9
diff --git a/Makefile.in b/Makefile.in
index 7a38abeca1c..542c30bbab7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -889,18 +889,13 @@ dvi:
889.PHONY: bootstrap 889.PHONY: bootstrap
890 890
891# Bootstrapping does the following: 891# Bootstrapping does the following:
892# * Remove files to start from a clean slate. 892# * Remove files to start from a bootstrap-clean slate.
893# * Run autogen.sh, falling back on copy_autogen if autogen.sh fails. 893# * Run autogen.sh, falling back on copy_autogen if autogen.sh fails.
894# * Build Makefile, to build the build procedure itself. 894# * Rebuild Makefile, to update the build procedure itself.
895# * Do the actual build. 895# * Do the actual build.
896bootstrap: bootstrap-clean FRC 896bootstrap: bootstrap-clean FRC
897 cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; } 897 cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
898 if [ -x config.status ]; then \ 898 $(MAKE) $(MFLAGS) Makefile
899 ./config.status --recheck && \
900 ./config.status; \
901 else \
902 $(srcdir)/configure $(CONFIGURE_FLAGS); \
903 fi
904 $(MAKE) $(MFLAGS) info all 899 $(MAKE) $(MFLAGS) info all
905 900
906.PHONY: check-declare 901.PHONY: check-declare