diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-09-18 00:43:12 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-09-18 00:43:12 +0200 |
| commit | d3612ac370d4b1378997d1c8344b24cf34add8fe (patch) | |
| tree | 5e6d24920ca98aa91c2cb24ab72adfe6421df83f | |
| parent | dee26dfa11ac3936c84f42b83a0e1ec7ae2b15f9 (diff) | |
| download | emacs-d3612ac370d4b1378997d1c8344b24cf34add8fe.tar.gz | |
* Makefile.in (bootstrap): Revert last change. Run config.status
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 9 |
2 files changed, 13 insertions, 2 deletions
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 |