2009-12-22 Felix Zielcke <fzielcke@z-51.de>

	* util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@.
	* genmk.rb (class SCRIPT): Modify the target file instead of source.

diff --git a/ChangeLog b/ChangeLog
index c0c978dac0e5bb02a087420be6248a7ef28ae331..34de0864bf4d48bed9809b97c42f701a3313a470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22 Felix Zielcke <fzielcke@z-51.de>
+
+       * util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@.
+       * genmk.rb (class SCRIPT): Modify the target file instead of source.
+
 2009-12-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * commands/memrw.c (grub_cmd_write): Support for mask parameter.

diff --git a/genmk.rb b/genmk.rb
index 5381aebf53114e42c777839969dd15cc00e27a2d..b3dbe867811d36347d7567039ebb84d496284d8c 100644 (file)
--- a/genmk.rb
+++ b/genmk.rb
@@ -363,8 +363,8 @@ class Script
     "CLEANFILES += #{@name}
 
 #{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
-       sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $(srcdir)/#{src}
        ./config.status --file=#{name}:#{src}
+       sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $@
        chmod +x $@
 
 "

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index c56525c103dba48e15fcc7701c443f4130b6a301..6b3c9ecb8d89d7e982778b94d735d56feedd6157 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -28,7 +28,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 native_platform=@platform@
-pkglib_DATA="efiemu32.o efiemu64.o moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst"
+pkglib_DATA="@pkglib_DATA@"
 
 coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc