From 773233f8c325184da4305fc00645e061d481f182 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 4 May 2011 20:30:03 -0700 Subject: [PATCH] Stop bootstrap clobbering config.log (bug#765) * Makefile.in (bootstrap-clean): Save config.log. (top_distclean): Delete config.log~. --- ChangeLog | 5 +++++ Makefile.in | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a561f8efeec..83bbcf49d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-05 Glenn Morris + + * Makefile.in (bootstrap-clean): Save config.log. (Bug#765) + (top_distclean): Delete config.log~. + 2011-04-27 Ben Key * configure.in: Fixed a bug that caused configure with diff --git a/Makefile.in b/Makefile.in index e5828b35199..4848d737a9a 100644 --- 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; \ -- 2.39.2