Re: [PATCH]: Missing tests-base in gnulib-cache.m4

[Simon Josefsson]

Bruno Haible <address@hidden> writes:

>> - Then editing libmissing/Makefile.am by hand to list the "tests"
>> directory as SUBDIRS (shouldn't this be handled automatically?).
>
> Right, it should be handled automatically. Currently gnulib-tool is asking
> the user to make a change to a file that is generated by gnulib-tool, and
> invoking "gnulib-tool --import" once again will erase the manual change.
> I'm fixing this through the patch below.

It doesn't work fully, in libidn doing a --import with the new
gnulib-tool results in a diff:

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 934ab4f..31890af 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,10 +9,11 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgnu --source-base=gl --m4-base=gl/m4 -
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgnu --source-base=gl --m4-base=gl/m4 -
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
+SUBDIRS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_LTLIBRARIES =
@@ -24,6 +25,7 @@ MOSTLYCLEANDIRS =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
+EXTRA_DIST += m4/gnulib-cache.m4
 
 AM_CPPFLAGS =
 

As you can see, the EXTRA_DIST contains the wrong path: it should be
gl/m4/gnulib-cache.m4.

Otherwise it looks good to me too, FWIW.

/Simon