[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110134: * Makefile.in (bootstrap): S
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110134: * Makefile.in (bootstrap): Simplify build procedure. |
Date: |
Sat, 22 Sep 2012 03:59:13 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110134
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-22 03:59:13 -0700
message:
* Makefile.in (bootstrap): Simplify build procedure.
Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-22 09:46:20 +0000
+++ b/ChangeLog 2012-09-22 10:59:13 +0000
@@ -1,5 +1,9 @@
2012-09-22 Paul Eggert <address@hidden>
+ * 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
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-09-17 22:43:12 +0000
+++ b/Makefile.in 2012-09-22 10:59:13 +0000
@@ -889,18 +889,13 @@
.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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110134: * Makefile.in (bootstrap): Simplify build procedure.,
Paul Eggert <=