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 @@
+2011-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (config.status): Don't erase in case of error.
+        In case it disappeared, rebuild it with `configure'.
+
 2011-04-20  Ken Brown  <kbrown@cornell.edu>
 
         * 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 \
           $(srcdir)/test/automated/Makefile.in
         ./config.status
 
+# Don't erase config.status if make is interrupted while refreshing it.
+.PRECIOUS: config.status
+
 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
-        ./config.status --recheck
+        if [ -x ./config.status ]; then \
+            ./config.status --recheck;  \
+        else                            \
+            ./configure;                \
+        fi
 
 AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4