aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-04-20 14:23:30 -0300
committerStefan Monnier2011-04-20 14:23:30 -0300
commitbfab7d852d64bcfe68073e03e787eb2200391d9d (patch)
tree2c1e6c7c97d039aa06c897a1ddd0a4892210d9b2
parentbed7f14004246c8ade77a48f79f0cc48f2ca74f7 (diff)
downloademacs-bfab7d852d64bcfe68073e03e787eb2200391d9d.tar.gz
emacs-bfab7d852d64bcfe68073e03e787eb2200391d9d.zip
* Makefile.in (config.status): Don't erase in case of error.
In case it disappeared, rebuild it with `configure'.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a3b1701726..7fcdef4272b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12011-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * Makefile.in (config.status): Don't erase in case of error.
4 In case it disappeared, rebuild it with `configure'.
5
12011-04-20 Ken Brown <kbrown@cornell.edu> 62011-04-20 Ken Brown <kbrown@cornell.edu>
2 7
3 * configure.in (use_mmap_for_buffers): Set to yes on Cygwin. 8 * configure.in (use_mmap_for_buffers): Set to yes on Cygwin.
diff --git a/Makefile.in b/Makefile.in
index 1ac77ed66ac..d828649e7aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -402,8 +402,15 @@ Makefile: config.status $(srcdir)/src/config.in \
402 $(srcdir)/test/automated/Makefile.in 402 $(srcdir)/test/automated/Makefile.in
403 ./config.status 403 ./config.status
404 404
405# Don't erase config.status if make is interrupted while refreshing it.
406.PRECIOUS: config.status
407
405config.status: ${srcdir}/configure ${srcdir}/lisp/version.el 408config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
406 ./config.status --recheck 409 if [ -x ./config.status ]; then \
410 ./config.status --recheck; \
411 else \
412 ./configure; \
413 fi
407 414
408AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4 415AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
409 416