lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-08 17:22:05 +03:00
Code Activity

Make pkgdata_DATA a cumulative variable. From Ralf Wildenhues.

Browse Source
This commit is contained in:
Bruno Haible
2006-08-07 12:17:26 +00:00
parent be5a3998ec
commit 569f392510
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -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> 2006-08-04 Bruno Haible <bruno@clisp.org>
* gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):

4
gnulib-tool
View File

@@ -22,7 +22,7 @@
progname=$0 progname=$0
package=gnulib 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: ,,'` last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` 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}_SOURCES ="
echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@" echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
echo "noinst_HEADERS =" echo "noinst_HEADERS ="
echo "pkgdata_DATA ="
echo "EXTRA_DIST =" echo "EXTRA_DIST ="
echo "BUILT_SOURCES =" echo "BUILT_SOURCES ="
echo "SUFFIXES =" echo "SUFFIXES ="
@@ -977,6 +978,7 @@ func_emit_tests_Makefile_am ()
echo "noinst_PROGRAMS =" echo "noinst_PROGRAMS ="
echo "check_PROGRAMS =" echo "check_PROGRAMS ="
echo "noinst_HEADERS =" echo "noinst_HEADERS ="
echo "pkgdata_DATA ="
echo "EXTRA_DIST =" echo "EXTRA_DIST ="
echo "BUILT_SOURCES =" echo "BUILT_SOURCES ="
echo "SUFFIXES =" echo "SUFFIXES ="

2
modules/javaversion
View File

@@ -20,7 +20,7 @@ configure.ac:
Makefile.am: Makefile.am:
lib_SOURCES += javaversion.h javaversion.c lib_SOURCES += javaversion.h javaversion.c
EXTRA_DIST += javaversion.java javaversion.class EXTRA_DIST += javaversion.java javaversion.class
pkgdata_DATA = javaversion.class pkgdata_DATA += javaversion.class
DEFS += -DPKGDATADIR=\"$(pkgdatadir)\" DEFS += -DPKGDATADIR=\"$(pkgdatadir)\"
Include: Include: