Re: automake-1.7.5 maintainer-clean vs. autom4te.cache

[Alexandre Duret-Lutz]

>>> "Ralf" == Ralf Corsepius <address@hidden> writes:

 Ralf> Hi,
 Ralf> 1.7.5 generates a "maintainer-clean"-rule that tries to remove
 Ralf> autom4te.caches from the build-directory, only.
[...]
 Ralf> To fix this, I am proposing the patch to 1.7.x below 

Thanks you.  I'm installing the following on HEAD and branch-1-7.


2003-06-27  Alexandre Duret-Lutz  <address@hidden>

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

2003-06-27  Ralf Corsepius  <address@hidden>  (tiny change)

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

Index: lib/am/configure.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/configure.am,v
retrieving revision 1.21
diff -u -r1.21 configure.am
--- lib/am/configure.am 20 Jun 2003 08:16:43 -0000      1.21
+++ lib/am/configure.am 27 Jun 2003 18:32:38 -0000
@@ -141,7 +141,7 @@
 ## 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%
Index: tests/aclocal6.test
===================================================================
RCS file: /cvs/automake/automake/tests/aclocal6.test,v
retrieving revision 1.2
diff -u -r1.2 aclocal6.test
--- tests/aclocal6.test 27 Apr 2003 18:14:37 -0000      1.2
+++ tests/aclocal6.test 27 Jun 2003 18:32:38 -0000
@@ -75,3 +75,14 @@
 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

-- 
Alexandre Duret-Lutz