From 569f392510873558143c8dfd6bee139a18b39663 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 7 Aug 2006 12:17:26 +0000 Subject: [PATCH] Make pkgdata_DATA a cumulative variable. From Ralf Wildenhues. --- ChangeLog | 7 +++++++ gnulib-tool | 4 +++- modules/javaversion | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23980d1f54..bda1a30457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-08-06 Ralf Wildenhues + + * 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 * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): diff --git a/gnulib-tool b/gnulib-tool index 58365fd0ca..df02c69faa 100755 --- 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 c24b501bec..7efba89e42 100644 --- 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: -- 2.30.2