2003-06-27 Alexandre Duret-Lutz <adl@gnu.org>

	* tests/aclocal6.test: Test maintainer-clean in VPATH
	builds. (For Ralf's fix.)

2003-06-27  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>  (tiny change)

	* lib/am/configure.am (maintainer-clean): Remove
	$(top_srcdir)/autom4te.cache, not autom4te.cache.

diff --git a/ChangeLog b/ChangeLog
index 8d58e50..93933f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-27  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/aclocal6.test: Test maintainer-clean in VPATH
+       builds. (For Ralf's fix.)
+
+2003-06-27  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>  (tiny change)
+
+       * lib/am/configure.am (maintainer-clean): Remove
+       $(top_srcdir)/autom4te.cache, not autom4te.cache.
+
 2003-06-27  Akim Demaille  <akim@epita.fr>
 
        * automake.texi: Use @node with a single argument.

diff --git a/lib/am/configure.am b/lib/am/configure.am
index b886ef9..adf3dfd 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -141,7 +141,7 @@ maintainer-clean:
 ## If you have an autom4te.cache that cause distcheck to fail, then
 ## it is good news: you finally discovered that autoconf and/or
 ## autoheader is needed to use your tarball, which is wrong.
-       -rm -rf autom4te.cache
+       -rm -rf $(top_srcdir)/autom4te.cache
 
 
 endif %?TOPDIR_P%

diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index fe28a5e..f05bd8e 100755 (executable)
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -75,3 +75,14 @@ $MAKE distdir
 test -f aclocal6-1.0/m4/moredefs.m4
 test -f aclocal6-1.0/m4/somedefs.m4
 test -f aclocal6-1.0/acinclude.m4
+
+# Make sure maintainer-clean works in VPATH builds.
+# (This is unrelated to the rest of this test.)
+$MAKE clean
+test -d ../autom4te.cache
+test -f Makefile
+test -f sub/Makefile
+$MAKE maintainer-clean
+test ! -d ../autom4te.cache
+test ! -f Makefile
+test ! -f sub/Makefile