aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2014-11-14 21:44:03 +0100
committerAndreas Schwab2014-11-14 21:47:30 +0100
commita6a43d654a5f2a139c69f75f6d46383bf58b3a77 (patch)
treee6c002645066a3ea43cfad203a32080eaee84598
parentdc7a3ba28b49fe67e469931bc9e66ea1b71fc4d3 (diff)
downloademacs-a6a43d654a5f2a139c69f75f6d46383bf58b3a77.tar.gz
emacs-a6a43d654a5f2a139c69f75f6d46383bf58b3a77.zip
Don't rerun configure if lisp/version.el changes
lisp/version.el is no longer the authority for emacs-version. * Makefile.in (config.status): Don't depend on ${srcdir}/lisp/version.el.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c11ebea31df..6d8543c7884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-11-14 Andreas Schwab <schwab@linux-m68k.org>
2
3 * Makefile.in (config.status): Don't depend on
4 ${srcdir}/lisp/version.el.
5
12014-11-14 Paul Eggert <eggert@cs.ucla.edu> 62014-11-14 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Merge from gnulib. 8 Merge from gnulib.
diff --git a/Makefile.in b/Makefile.in
index 25d2a08d907..ccb70a436e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -408,7 +408,7 @@ $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
408# Don't erase these files if make is interrupted while refreshing them. 408# Don't erase these files if make is interrupted while refreshing them.
409.PRECIOUS: Makefile config.status 409.PRECIOUS: Makefile config.status
410 410
411config.status: ${srcdir}/configure ${srcdir}/lisp/version.el 411config.status: ${srcdir}/configure
412 if [ -x ./config.status ]; then \ 412 if [ -x ./config.status ]; then \
413 $(CFG) ./config.status --recheck; \ 413 $(CFG) ./config.status --recheck; \
414 else \ 414 else \