merge from trunk

4 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 27395616072..1d2adca4044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (distclean, bootstrap-clean, maintainer-clean):
+        Clean test/automated if present.
+
 2013-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         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
         (cd leim;     $(MAKE) $(MFLAGS) distclean)
         (cd lisp;     $(MAKE) $(MFLAGS) distclean)
         (cd nextstep && $(MAKE) $(MFLAGS) distclean)
+        [ ! -d test/automated ] || \
+          cd test/automated && $(MAKE) $(MFLAGS) distclean
         ${top_distclean}
 
 ### `bootstrap-clean'
@@ -878,6 +880,8 @@ bootstrap-clean: FRC
         (cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
         (cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
         (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean)
+        [ ! -d test/automated ] || \
+          cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean
         [ ! -f config.log ] || mv -f config.log config.log~
         ${top_bootclean}
 
@@ -898,6 +902,8 @@ top_maintainer_clean=\
 maintainer-clean: bootstrap-clean FRC
         (cd src;      $(MAKE) $(MFLAGS) maintainer-clean)
         (cd lisp;     $(MAKE) $(MFLAGS) maintainer-clean)
+        [ ! -d test/automated ] || \
+          cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean
         ${top_maintainer_clean}
 
 ### This doesn't actually appear in the coding standards, but Karl
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 799009063e1..799009063e1 100755..100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
diff --git a/test/automated/package-x-test.el b/test/automated/package-x-test.el
index beb18358085..beb18358085 100755..100644
--- a/test/automated/package-x-test.el
+++ b/test/automated/package-x-test.el