auto upstream

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5164dc8ff8d..31764cad485 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (bootstrap-clean): Remove stamp-h1 too.
+        Without this fix, "make distclean" leaves stamp-h1 behind.
+
 2013-04-20  Erik Charlebois  <erikcharlebois@gmail.com>
 
         * w32fns.c (w32_fullscreen_rect): New function to compute the
diff --git a/src/Makefile.in b/src/Makefile.in
index ac09d41858d..d6516e812dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -545,7 +545,7 @@ clean: mostlyclean
 ## It should remove all files generated during a compilation/bootstrap,
 ## but not things like config.status or TAGS.
 bootstrap-clean: clean
-        rm -f epaths.h config.h config.stamp stamp-oldxmenu ../etc/DOC-*
+        rm -f epaths.h config.h config.stamp stamp-h1 stamp-oldxmenu ../etc/DOC-*
         if test -f ./.gdbinit; then \
           mv ./.gdbinit ./.gdbinit.save; \
           if test -f "$(srcdir)/.gdbinit"; then rm -f ./.gdbinit.save; \