Make pkgdata_DATA a cumulative variable. From Ralf Wildenhues.

diff --git a/ChangeLog b/ChangeLog
index 23980d1f54ac95927396bc5b174078272e37854c..bda1a304570299a03ff146f1ffb0fe964b55c77d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-06  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):
+       Initialize pkgdata_DATA.
+       * modules/javaversion (Makefile.am): Add to pkgdata_DATA, rather than
+       overriding it.
+
 2006-08-04  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):

diff --git a/gnulib-tool b/gnulib-tool
index 58365fd0ca4614769362b5e39dd5be13c7066b05..df02c69faabbe6ed6b89eb11f92c1d3a581c0f08 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-04 16:06:01 $'
+cvsdatestamp='$Date: 2006-08-07 12:17:26 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -899,6 +899,7 @@ func_emit_lib_Makefile_am ()
   echo "${libname}_${libext}_SOURCES ="
   echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
   echo "noinst_HEADERS ="
+  echo "pkgdata_DATA ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
@@ -977,6 +978,7 @@ func_emit_tests_Makefile_am ()
   echo "noinst_PROGRAMS ="
   echo "check_PROGRAMS ="
   echo "noinst_HEADERS ="
+  echo "pkgdata_DATA ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="

diff --git a/modules/javaversion b/modules/javaversion
index c24b501bec6382a641ec3f84d07f03c66e009dc7..7efba89e422328f7b9093cd7bec7003b252ab0ed 100644 (file)
--- a/modules/javaversion
+++ b/modules/javaversion
@@ -20,7 +20,7 @@ configure.ac:
 Makefile.am:
 lib_SOURCES += javaversion.h javaversion.c
 EXTRA_DIST += javaversion.java javaversion.class
-pkgdata_DATA = javaversion.class
+pkgdata_DATA += javaversion.class
 DEFS += -DPKGDATADIR=\"$(pkgdatadir)\"
 
 Include: