From: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon, 17 Sep 2012 22:43:12 +0000 (+0200)
Subject: * Makefile.in (bootstrap): Revert last change.  Run config.status
X-Git-Tag: emacs-24.2.90~269^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3612ac370d4b1378997d1c8344b24cf34add8fe;p=emacs.git

* Makefile.in (bootstrap): Revert last change.  Run config.status
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).
---

diff --git a/ChangeLog b/ChangeLog
index 3b5b6862a15..d6260f6c228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* 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  <eggert@cs.ucla.edu>
 
 	* Makefile.in: Fix build error on FreeBSD.
diff --git a/Makefile.in b/Makefile.in
index 56a54403ef3..7a38abeca1c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -367,7 +367,7 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
 	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 @@ dvi:
 #  * 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