* Makefile.in (distclean, bootstrap-clean, maintainer-clean):

Also clean admin/unidata, if present.

* admin/unidata/Makefile.in (bootstrap-clean): New rule.

4 files changed, 16 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index da6fb6bb97..4a47039e48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
+	Also clean admin/unidata, if present.
+
 2013-10-27  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac: It seems installing in non-ASCII is not, in fact, ok.
diff --git a/Makefile.in b/Makefile.in
index 2c854fd9ae..5cf2cb1200 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -870,9 +870,9 @@ 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; \
-	}
+	for dir in test/automated admin/unidata; do \
+	  [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) distclean); \
+	done
 	${top_distclean}
 
 ### `bootstrap-clean'
@@ -892,9 +892,9 @@ 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; \
-	}
+	for dir in test/automated admin/unidata; do \
+	  [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) bootstrap-clean); \
+	done
 	[ ! -f config.log ] || mv -f config.log config.log~
 	${top_bootclean}
 
@@ -915,9 +915,9 @@ 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; \
-	}
+	for dir in test/automated admin/unidata; do \
+	  [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) maintainer-clean); \
+	done
 	${top_maintainer_clean}
 
 ### This doesn't actually appear in the coding standards, but Karl
diff --git a/admin/ChangeLog b/admin/ChangeLog
index bbbd652f1b..baa8706fd3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -7,6 +7,7 @@
 	* unidata/Makefile.in (abs_srcdir): New, set by configure.
 	(${DSTDIR}/charprop.el, charprop.el): Update for srcdir not absolute.
 	(clean): Delete all .elc files.
+	(bootstrap-clean): New rule.
 
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 521f66f5bc..e4a8a87443 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -63,4 +63,4 @@ clean:
 distclean: clean
 	-rm -f ./Makefile
 
-maintainer-clean: distclean
+bootstrap-clean maintainer-clean: distclean