aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27395616072..1d2adca4044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-08-20 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (distclean, bootstrap-clean, maintainer-clean):
4 Clean test/automated if present.
5
12013-08-19 Paul Eggert <eggert@cs.ucla.edu> 62013-08-19 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Merge from gnulib, incorporating: 8 Merge from gnulib, incorporating:
diff --git a/Makefile.in b/Makefile.in
index ee74baf45cf..a0d91171d33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -859,6 +859,8 @@ distclean: FRC
859 (cd leim; $(MAKE) $(MFLAGS) distclean) 859 (cd leim; $(MAKE) $(MFLAGS) distclean)
860 (cd lisp; $(MAKE) $(MFLAGS) distclean) 860 (cd lisp; $(MAKE) $(MFLAGS) distclean)
861 (cd nextstep && $(MAKE) $(MFLAGS) distclean) 861 (cd nextstep && $(MAKE) $(MFLAGS) distclean)
862 [ ! -d test/automated ] || \
863 cd test/automated && $(MAKE) $(MFLAGS) distclean
862 ${top_distclean} 864 ${top_distclean}
863 865
864### `bootstrap-clean' 866### `bootstrap-clean'
@@ -878,6 +880,8 @@ bootstrap-clean: FRC
878 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) 880 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
879 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) 881 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
880 (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean) 882 (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean)
883 [ ! -d test/automated ] || \
884 cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean
881 [ ! -f config.log ] || mv -f config.log config.log~ 885 [ ! -f config.log ] || mv -f config.log config.log~
882 ${top_bootclean} 886 ${top_bootclean}
883 887
@@ -898,6 +902,8 @@ top_maintainer_clean=\
898maintainer-clean: bootstrap-clean FRC 902maintainer-clean: bootstrap-clean FRC
899 (cd src; $(MAKE) $(MFLAGS) maintainer-clean) 903 (cd src; $(MAKE) $(MFLAGS) maintainer-clean)
900 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) 904 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
905 [ ! -d test/automated ] || \
906 cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean
901 ${top_maintainer_clean} 907 ${top_maintainer_clean}
902 908
903### This doesn't actually appear in the coding standards, but Karl 909### This doesn't actually appear in the coding standards, but Karl