From 8703126698d7cf4cbb4f2b078db7d6b5e622fd75 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 27 Jun 2003 00:03:58 +0000
Subject: [PATCH] * lib/am/distdir.am (distcheck): Run $(am__remove_distdir) at
 the end of distcheck.  This was mistakenly removed on 2003-06-15. *
 tests/subpkg.test: Make sure distcheck cleans up after itself.

---
 ChangeLog         | 5 +++++
 Makefile.in       | 1 +
 lib/am/distdir.am | 1 +
 tests/subpkg.test | 1 +
 4 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1725b6c1..afa337bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-06-27  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* lib/am/distdir.am (distcheck): Run $(am__remove_distdir)
+	at the end of distcheck.  This was mistakenly removed on
+	2003-06-15.
+	* tests/subpkg.test: Make sure distcheck cleans up after itself.
+
 	* m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ...
 	($(top_srcdir)/m4/amversion.m4): ... this.
 	(DISTCLEANFILES): Remove.
diff --git a/Makefile.in b/Makefile.in
index 4786e31b..957bcb9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -582,6 +582,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  for i in $(DIST_ARCHIVES); do echo $$i; done) | \
 	  sed -e '1{h;s/./=/g;p;x}' -e '$${p;x}'
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index fc0dcb77..b8b568ee 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -348,6 +348,7 @@ distcheck: dist
 ## Make sure to remove the dists we created in the test build directory.
 	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  for i in $(DIST_ARCHIVES); do echo $$i; done) | \
 	  sed -e '1{h;s/./=/g;p;x}' -e '$${p;x}'
diff --git a/tests/subpkg.test b/tests/subpkg.test
index 6b67124e..c1f51578 100755
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -98,4 +98,5 @@ cd ..
 
 ./configure
 $MAKE distcheck
+test ! -d subpack-1		# make sure distcheck cleans up after itself
 test -f subpack-1.tar.gz
-- 
2.43.5