Commit bbe099e7 authored by Paul Eggert's avatar Paul Eggert
Browse files

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

Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
parent 54afd499
2012-09-22 Paul Eggert <eggert@cs.ucla.edu> 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: Merge from gnulib, incorporating:
2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases 2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
......
...@@ -889,18 +889,13 @@ dvi: ...@@ -889,18 +889,13 @@ dvi:
.PHONY: bootstrap .PHONY: bootstrap
# Bootstrapping does the following: # 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. # * 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. # * Do the actual build.
bootstrap: bootstrap-clean FRC bootstrap: bootstrap-clean FRC
cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; } cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
if [ -x config.status ]; then \ $(MAKE) $(MFLAGS) Makefile
./config.status --recheck && \
./config.status; \
else \
$(srcdir)/configure $(CONFIGURE_FLAGS); \
fi
$(MAKE) $(MFLAGS) info all $(MAKE) $(MFLAGS) info all
.PHONY: check-declare .PHONY: check-declare
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment