[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110082: * Makefile.in (bootstrap): R
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110082: * Makefile.in (bootstrap): Revert last change. Run config.status |
Date: |
Tue, 18 Sep 2012 00:43:12 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110082
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2012-09-18 00:43:12 +0200
message:
* Makefile.in (bootstrap): Revert last change. Run config.status
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-17 22:35:28 +0000
+++ b/ChangeLog 2012-09-17 22:43:12 +0000
@@ -1,3 +1,9 @@
+2012-09-17 Andreas Schwab <address@hidden>
+
+ * Makefile.in (bootstrap): Revert last change. Run config.status
+ after config.status --recheck, run configure from $(srcdir).
+ (config.status): Run configure from $(srcdir).
+
2012-09-17 Paul Eggert <address@hidden>
* Makefile.in: Fix build error on FreeBSD.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-09-17 22:35:28 +0000
+++ b/Makefile.in 2012-09-17 22:43:12 +0000
@@ -367,7 +367,7 @@
if [ -x ./config.status ]; then \
./config.status --recheck; \
else \
- ./configure $(CONFIGURE_FLAGS); \
+ $(srcdir)/configure $(CONFIGURE_FLAGS); \
fi
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
@@ -895,7 +895,12 @@
# * Do the actual build.
bootstrap: bootstrap-clean FRC
cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
- ./configure $(CONFIGURE_FLAGS)
+ if [ -x config.status ]; then \
+ ./config.status --recheck && \
+ ./config.status; \
+ else \
+ $(srcdir)/configure $(CONFIGURE_FLAGS); \
+ fi
$(MAKE) $(MFLAGS) info all
.PHONY: check-declare
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110082: * Makefile.in (bootstrap): Revert last change. Run config.status,
Andreas Schwab <=