Stop bootstrap clobbering config.log (bug#765)

* Makefile.in (bootstrap-clean): Save config.log.
(top_distclean): Delete config.log~.

diff --git a/ChangeLog b/ChangeLog
index a561f8efeec7eb365849218e7d63906e39f47e76..83bbcf49d8ea25e14d504039b70b9186d4d91139 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (bootstrap-clean): Save config.log.  (Bug#765)
+       (top_distclean): Delete config.log~.
+
 2011-04-27  Ben Key  <bkey76@gmail.com>
 
        * configure.in: Fixed a bug that caused configure with

diff --git a/Makefile.in b/Makefile.in
index e5828b3519915729e949a7bea0fd4b702baba6f5..4848d737a9a689a34fce7213f66ed193e1ee02eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -798,7 +798,7 @@ top_bootclean=\
 ###      distribution.
 top_distclean=\
        ${top_bootclean}; \
-       rm -f config.status Makefile stamp-h1 ${SUBDIR_MAKEFILES}
+       rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
 distclean: FRC
        (cd src;      $(MAKE) $(MFLAGS) distclean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
@@ -828,7 +828,10 @@ bootstrap-clean: FRC
        -(cd doc/lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
        (cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
        (cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
+       [ ! -e config.log ] || mv -f config.log config.log~
        ${top_bootclean}
+## configure; make bootstrap replaces the real config.log from configure
+## with the truncated one from config.status.  The former is more useful.
 
 ### `maintainer-clean'
 ###      Delete everything from the current directory that can be
@@ -927,6 +930,8 @@ dvi:
 
 .PHONY: bootstrap
 
+## configure; make boostrap replaces the real config.log from configure
+## with the truncated one from config.status.  The former is more useful.
 bootstrap: bootstrap-clean FRC
        if [ -x ./config.status ]; then           \
            ./config.status;                      \