[Emacs-diffs] /srv/bzr/emacs/trunk r104116: Stop bootstrap clobbering config.log (bug#765)

[Glenn Morris]

------------------------------------------------------------
revno: 104116
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-04 20:30:03 -0700
message:
  Stop bootstrap clobbering config.log (bug#765)
  
  * Makefile.in (bootstrap-clean): Save config.log.  
  (top_distclean): Delete config.log~.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-04-27 02:17:44 +0000
+++ b/ChangeLog 2011-05-05 03:30:03 +0000
@@ -1,3 +1,8 @@
+2011-05-05  Glenn Morris  <address@hidden>
+
+       * Makefile.in (bootstrap-clean): Save config.log.  (Bug#765)
+       (top_distclean): Delete config.log~.
+
 2011-04-27  Ben Key  <address@hidden>
 
        * configure.in: Fixed a bug that caused configure with

=== modified file 'Makefile.in'
--- a/Makefile.in       2011-04-26 06:17:52 +0000
+++ b/Makefile.in       2011-05-05 03:30:03 +0000
@@ -798,7 +798,7 @@
 ###      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 @@
        -(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 @@
 
 .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;                      \