[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110154: * Makefile.in (bootstrap): S
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110154: * Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile, |
Date: |
Sun, 23 Sep 2012 02:18:24 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110154
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 02:18:24 -0700
message:
* Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,
to avoid problems with recursion when using GNU make.
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-22 10:59:13 +0000
+++ b/ChangeLog 2012-09-23 09:18:24 +0000
@@ -1,3 +1,8 @@
+2012-09-23 Paul Eggert <address@hidden>
+
+ * Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,
+ to avoid problems with recursion when using GNU make.
+
2012-09-22 Paul Eggert <address@hidden>
* Makefile.in (bootstrap): Simplify build procedure.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-09-22 10:59:13 +0000
+++ b/Makefile.in 2012-09-23 09:18:24 +0000
@@ -355,6 +355,10 @@
# config.status overrides MAKEFILE_NAME with a bogus name when creating
# src/epaths.h, so that 'make epaths-force' does not recursively invoke
# config.status and overwrite config.status while executing it (Bug#11214).
+#
+# 'make bootstrap' overrides MAKEFILE_NAME to a nonexistent file but
+# then attempts to build that file. This forces 'Makefile', 'lib/Makefile',
+# etc. to be built without running into similar recursion problems.
MAKEFILE_NAME = Makefile
$(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
$(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN)
@@ -895,7 +899,7 @@
# * Do the actual build.
bootstrap: bootstrap-clean FRC
cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
- $(MAKE) $(MFLAGS) Makefile
+ $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
$(MAKE) $(MFLAGS) info all
.PHONY: check-declare
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110154: * Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,,
Paul Eggert <=