* 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.

diff --git a/ChangeLog b/ChangeLog
index 1725b6c1ecbb514556b517c6eb7e91716f5e3491..afa337bcdf4ad0c8f16d465a424f241798a9d2bd 100644 (file)
--- 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 4786e31bc88873b89c41eb42397b268c14e437e7..957bcb9ea84765dd7536cd8ce86ab919f5b0feaf 100644 (file)
--- 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 fc0dcb77be452ce784e5ab47fb0a4afc0195da69..b8b568ee80a6ee67b949d378e8eb50cc1efbe8f8 100644 (file)
--- 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 6b67124ec4af64555267e3e16b10617dbd93a27f..c1f51578e8d0d321198154c03e7d473c54ea541d 100755 (executable)
--- 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