* 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 3b5b6862a15957c31192574c6f7bc7e98da51e5e..d6260f6c228977d51a762a59ea784c00add65cf5 100644 (file)
--- 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 56a54403ef3f178910bdcd274caa5188f5a1b9d2..7a38abeca1ca7dae9a76605ed484a79f85ef7ece 100644 (file)
--- 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