Upstream-Status: Pending

Fixes these errors observed with automake 1.11.2
The useof pkglibhas become more strict compared to the earlier release of
automake resulting in these failures.
Fixed the files related to automake to avoid the issue.

| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA'
| grub-core/Makefile.am:5:   `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA'
| Makefile.am:6:   `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.



| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS'
| grub-core/Makefile.am:5:   `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA'
| grub-core/Makefile.am:5:   `conf/Makefile.common' included from here
| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS'
| Makefile.am:6:   `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA'
| Makefile.am:6:   `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1

Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2012/01/12


Index: grub-1.99/conf/Makefile.common
===================================================================
--- grub-1.99.orig/conf/Makefile.common
+++ grub-1.99/conf/Makefile.common
@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
 
 man_MANS =
 noinst_DATA =
-pkglib_DATA =
+pkgdata_DATA =
 bin_SCRIPTS =
 sbin_SCRIPTS =
 bin_PROGRAMS =
@@ -147,7 +147,7 @@ check_SCRIPTS =
 grubconf_DATA =
 check_PROGRAMS =
 noinst_SCRIPTS =
-pkglib_SCRIPTS =
+pkglibexec_SCRIPTS =
 noinst_PROGRAMS =
 grubconf_SCRIPTS =
 noinst_LIBRARIES =
Index: grub-1.99/Makefile.am
===================================================================
--- grub-1.99.orig/Makefile.am
+++ grub-1.99/Makefile.am
@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
 # Install config.h into platformdir
 platform_HEADERS = config.h
 
-pkglib_DATA += grub-mkconfig_lib
-pkglib_DATA += update-grub_lib
+pkgdata_DATA += grub-mkconfig_lib
+pkgdata_DATA += update-grub_lib
 
 
 if COND_i386_coreboot
Index: grub-1.99/Makefile.tpl
===================================================================
--- grub-1.99.orig/Makefile.tpl
+++ grub-1.99/Makefile.tpl
@@ -30420,7 +30420,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30461,7 +30461,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30508,7 +30508,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30557,7 +30557,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30607,7 +30607,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30657,7 +30657,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30707,7 +30707,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30756,7 +30756,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30803,7 +30803,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30846,7 +30846,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30887,7 +30887,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30926,7 +30926,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30962,7 +30962,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -30998,7 +30998,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31034,7 +31034,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31070,7 +31070,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31106,7 +31106,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31147,7 +31147,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31193,7 +31193,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31239,7 +31239,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31285,7 +31285,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31331,7 +31331,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31377,7 +31377,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31423,7 +31423,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31469,7 +31469,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31515,7 +31515,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31561,7 +31561,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31607,7 +31607,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31654,7 +31654,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31702,7 +31702,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31750,7 +31750,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31798,7 +31798,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31846,7 +31846,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31894,7 +31894,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31942,7 +31942,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -31990,7 +31990,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32038,7 +32038,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32086,7 +32086,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32134,7 +32134,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32182,7 +32182,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32231,7 +32231,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32281,7 +32281,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32331,7 +32331,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32381,7 +32381,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32431,7 +32431,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32481,7 +32481,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32531,7 +32531,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32581,7 +32581,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32631,7 +32631,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32681,7 +32681,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32731,7 +32731,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32781,7 +32781,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32831,7 +32831,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32881,7 +32881,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32931,7 +32931,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -32981,7 +32981,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33031,7 +33031,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33081,7 +33081,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33131,7 +33131,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33181,7 +33181,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33231,7 +33231,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33281,7 +33281,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33331,7 +33331,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33381,7 +33381,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33431,7 +33431,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33481,7 +33481,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33531,7 +33531,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33581,7 +33581,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33631,7 +33631,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33681,7 +33681,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33731,7 +33731,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33781,7 +33781,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33831,7 +33831,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33881,7 +33881,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33931,7 +33931,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -33981,7 +33981,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34031,7 +34031,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34081,7 +34081,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34131,7 +34131,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34181,7 +34181,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34231,7 +34231,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34281,7 +34281,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34331,7 +34331,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34381,7 +34381,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34431,7 +34431,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34481,7 +34481,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34531,7 +34531,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34581,7 +34581,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34631,7 +34631,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34681,7 +34681,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34731,7 +34731,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34781,7 +34781,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34830,7 +34830,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34878,7 +34878,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34926,7 +34926,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -34974,7 +34974,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35022,7 +35022,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35070,7 +35070,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35118,7 +35118,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35166,7 +35166,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35214,7 +35214,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35262,7 +35262,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35310,7 +35310,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35358,7 +35358,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35405,7 +35405,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35451,7 +35451,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35497,7 +35497,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35543,7 +35543,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35589,7 +35589,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35635,7 +35635,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35681,7 +35681,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35727,7 +35727,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35773,7 +35773,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35819,7 +35819,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35865,7 +35865,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35908,7 +35908,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35948,7 +35948,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -35988,7 +35988,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36028,7 +36028,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36068,7 +36068,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36108,7 +36108,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36148,7 +36148,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36188,7 +36188,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36229,7 +36229,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36271,7 +36271,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36313,7 +36313,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36355,7 +36355,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36397,7 +36397,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36439,7 +36439,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36481,7 +36481,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36523,7 +36523,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
@@ -36565,7 +36565,7 @@ CLEANFILES += [+ name +].[+ mansection +
 endif
 [+ ENDIF +][+ ENDIF +]
 [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x [+ name +]
 	
 CLEANFILES += [+ name +]
Index: grub-1.99/Makefile.util.am
===================================================================
--- grub-1.99.orig/Makefile.util.am
+++ grub-1.99/Makefile.util.am
@@ -4111,7 +4111,7 @@ if COND_emu
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4122,7 +4122,7 @@ if COND_i386_pc
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4133,7 +4133,7 @@ if COND_i386_efi
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4144,7 +4144,7 @@ if COND_i386_qemu
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4155,7 +4155,7 @@ if COND_i386_coreboot
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4166,7 +4166,7 @@ if COND_i386_multiboot
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4177,7 +4177,7 @@ if COND_i386_ieee1275
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4188,7 +4188,7 @@ if COND_x86_64_efi
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4199,7 +4199,7 @@ if COND_mips_yeeloong
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4210,7 +4210,7 @@ if COND_sparc64_ieee1275
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4221,7 +4221,7 @@ if COND_powerpc_ieee1275
 grubconf_SCRIPTS += 00_header
 
 00_header: util/grub.d/00_header.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 00_header
 	
 CLEANFILES += 00_header
@@ -4233,7 +4233,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4246,7 +4246,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4259,7 +4259,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4272,7 +4272,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4285,7 +4285,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4298,7 +4298,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4311,7 +4311,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4324,7 +4324,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4337,7 +4337,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4350,7 +4350,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4363,7 +4363,7 @@ if COND_HOST_WINDOWS
 grubconf_SCRIPTS += 10_windows
 
 10_windows: util/grub.d/10_windows.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_windows
 	
 CLEANFILES += 10_windows
@@ -4376,7 +4376,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4389,7 +4389,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4402,7 +4402,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4415,7 +4415,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4428,7 +4428,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4441,7 +4441,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4454,7 +4454,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4467,7 +4467,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4480,7 +4480,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4493,7 +4493,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4506,7 +4506,7 @@ if COND_HOST_HURD
 grubconf_SCRIPTS += 10_hurd
 
 10_hurd: util/grub.d/10_hurd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_hurd
 	
 CLEANFILES += 10_hurd
@@ -4519,7 +4519,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4532,7 +4532,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4545,7 +4545,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4558,7 +4558,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4571,7 +4571,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4584,7 +4584,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4597,7 +4597,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4610,7 +4610,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4623,7 +4623,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4636,7 +4636,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4649,7 +4649,7 @@ if COND_HOST_KFREEBSD
 grubconf_SCRIPTS += 10_kfreebsd
 
 10_kfreebsd: util/grub.d/10_kfreebsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_kfreebsd
 	
 CLEANFILES += 10_kfreebsd
@@ -4662,7 +4662,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4675,7 +4675,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4688,7 +4688,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4701,7 +4701,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4714,7 +4714,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4727,7 +4727,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4740,7 +4740,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4753,7 +4753,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4766,7 +4766,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4779,7 +4779,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4792,7 +4792,7 @@ if COND_HOST_NETBSD
 grubconf_SCRIPTS += 10_netbsd
 
 10_netbsd: util/grub.d/10_netbsd.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_netbsd
 	
 CLEANFILES += 10_netbsd
@@ -4805,7 +4805,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4818,7 +4818,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4831,7 +4831,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4844,7 +4844,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4857,7 +4857,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4870,7 +4870,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4883,7 +4883,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4896,7 +4896,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4909,7 +4909,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4922,7 +4922,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4935,7 +4935,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 10_linux
 
 10_linux: util/grub.d/10_linux.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 10_linux
 	
 CLEANFILES += 10_linux
@@ -4948,7 +4948,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -4961,7 +4961,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -4974,7 +4974,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -4987,7 +4987,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5000,7 +5000,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5013,7 +5013,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5026,7 +5026,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5039,7 +5039,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5052,7 +5052,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5065,7 +5065,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5078,7 +5078,7 @@ if COND_HOST_LINUX
 grubconf_SCRIPTS += 20_linux_xen
 
 20_linux_xen: util/grub.d/20_linux_xen.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 20_linux_xen
 	
 CLEANFILES += 20_linux_xen
@@ -5090,7 +5090,7 @@ if COND_emu
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5101,7 +5101,7 @@ if COND_i386_pc
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5112,7 +5112,7 @@ if COND_i386_efi
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5123,7 +5123,7 @@ if COND_i386_qemu
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5134,7 +5134,7 @@ if COND_i386_coreboot
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5145,7 +5145,7 @@ if COND_i386_multiboot
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5156,7 +5156,7 @@ if COND_i386_ieee1275
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5167,7 +5167,7 @@ if COND_x86_64_efi
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5178,7 +5178,7 @@ if COND_mips_yeeloong
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5189,7 +5189,7 @@ if COND_sparc64_ieee1275
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5200,7 +5200,7 @@ if COND_powerpc_ieee1275
 grubconf_SCRIPTS += 30_os-prober
 
 30_os-prober: util/grub.d/30_os-prober.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 30_os-prober
 	
 CLEANFILES += 30_os-prober
@@ -5211,7 +5211,7 @@ if COND_emu
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5222,7 +5222,7 @@ if COND_i386_pc
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5233,7 +5233,7 @@ if COND_i386_efi
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5244,7 +5244,7 @@ if COND_i386_qemu
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5255,7 +5255,7 @@ if COND_i386_coreboot
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5266,7 +5266,7 @@ if COND_i386_multiboot
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5277,7 +5277,7 @@ if COND_i386_ieee1275
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5288,7 +5288,7 @@ if COND_x86_64_efi
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5299,7 +5299,7 @@ if COND_mips_yeeloong
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5310,7 +5310,7 @@ if COND_sparc64_ieee1275
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5321,7 +5321,7 @@ if COND_powerpc_ieee1275
 grubconf_SCRIPTS += 40_custom
 
 40_custom: util/grub.d/40_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 40_custom
 	
 CLEANFILES += 40_custom
@@ -5332,7 +5332,7 @@ if COND_emu
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5343,7 +5343,7 @@ if COND_i386_pc
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5354,7 +5354,7 @@ if COND_i386_efi
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5365,7 +5365,7 @@ if COND_i386_qemu
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5376,7 +5376,7 @@ if COND_i386_coreboot
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5387,7 +5387,7 @@ if COND_i386_multiboot
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5398,7 +5398,7 @@ if COND_i386_ieee1275
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5409,7 +5409,7 @@ if COND_x86_64_efi
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5420,7 +5420,7 @@ if COND_mips_yeeloong
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5431,7 +5431,7 @@ if COND_sparc64_ieee1275
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5442,7 +5442,7 @@ if COND_powerpc_ieee1275
 grubconf_SCRIPTS += 41_custom
 
 41_custom: util/grub.d/41_custom.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x 41_custom
 	
 CLEANFILES += 41_custom
@@ -5462,7 +5462,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5482,7 +5482,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5502,7 +5502,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5522,7 +5522,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5542,7 +5542,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5562,7 +5562,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5582,7 +5582,7 @@ CLEANFILES += grub-mkrescue.1
 endif
 
 grub-mkrescue: util/powerpc/ieee1275/grub-mkrescue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkrescue
 	
 CLEANFILES += grub-mkrescue
@@ -5602,7 +5602,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5622,7 +5622,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5642,7 +5642,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5662,7 +5662,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5682,7 +5682,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5702,7 +5702,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5722,7 +5722,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5742,7 +5742,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5762,7 +5762,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5782,7 +5782,7 @@ CLEANFILES += grub-install.8
 endif
 
 grub-install: util/grub-install.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-install
 	
 CLEANFILES += grub-install
@@ -5802,7 +5802,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5822,7 +5822,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5842,7 +5842,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5862,7 +5862,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5882,7 +5882,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5902,7 +5902,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5922,7 +5922,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5942,7 +5942,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5962,7 +5962,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -5982,7 +5982,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -6002,7 +6002,7 @@ CLEANFILES += grub-mknetdir.8
 endif
 
 grub-mknetdir: util/grub-mknetdir.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mknetdir
 	
 CLEANFILES += grub-mknetdir
@@ -6022,7 +6022,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6042,7 +6042,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6062,7 +6062,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6082,7 +6082,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6102,7 +6102,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6122,7 +6122,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6142,7 +6142,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6162,7 +6162,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6182,7 +6182,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6202,7 +6202,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6222,7 +6222,7 @@ CLEANFILES += grub-mkconfig.8
 endif
 
 grub-mkconfig: util/grub-mkconfig.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig
 	
 CLEANFILES += grub-mkconfig
@@ -6242,7 +6242,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6262,7 +6262,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6282,7 +6282,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6302,7 +6302,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6322,7 +6322,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6342,7 +6342,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6362,7 +6362,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6382,7 +6382,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6402,7 +6402,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6422,7 +6422,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6442,7 +6442,7 @@ CLEANFILES += grub-set-default.8
 endif
 
 grub-set-default: util/grub-set-default.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-set-default
 	
 CLEANFILES += grub-set-default
@@ -6462,7 +6462,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6482,7 +6482,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6502,7 +6502,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6522,7 +6522,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6542,7 +6542,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6562,7 +6562,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6582,7 +6582,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6602,7 +6602,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6622,7 +6622,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6642,7 +6642,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6662,7 +6662,7 @@ CLEANFILES += grub-reboot.8
 endif
 
 grub-reboot: util/grub-reboot.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-reboot
 	
 CLEANFILES += grub-reboot
@@ -6673,7 +6673,7 @@ if COND_emu
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6684,7 +6684,7 @@ if COND_i386_pc
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6695,7 +6695,7 @@ if COND_i386_efi
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6706,7 +6706,7 @@ if COND_i386_qemu
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6717,7 +6717,7 @@ if COND_i386_coreboot
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6728,7 +6728,7 @@ if COND_i386_multiboot
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6739,7 +6739,7 @@ if COND_i386_ieee1275
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6750,7 +6750,7 @@ if COND_x86_64_efi
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6761,7 +6761,7 @@ if COND_mips_yeeloong
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6772,7 +6772,7 @@ if COND_sparc64_ieee1275
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6783,7 +6783,7 @@ if COND_powerpc_ieee1275
 noinst_SCRIPTS += grub-mkconfig_lib
 
 grub-mkconfig_lib: util/grub-mkconfig_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-mkconfig_lib
 	
 CLEANFILES += grub-mkconfig_lib
@@ -6794,7 +6794,7 @@ if COND_emu
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6805,7 +6805,7 @@ if COND_i386_pc
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6816,7 +6816,7 @@ if COND_i386_efi
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6827,7 +6827,7 @@ if COND_i386_qemu
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6838,7 +6838,7 @@ if COND_i386_coreboot
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6849,7 +6849,7 @@ if COND_i386_multiboot
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6860,7 +6860,7 @@ if COND_i386_ieee1275
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6871,7 +6871,7 @@ if COND_x86_64_efi
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6882,7 +6882,7 @@ if COND_mips_yeeloong
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6893,7 +6893,7 @@ if COND_sparc64_ieee1275
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6904,7 +6904,7 @@ if COND_powerpc_ieee1275
 noinst_SCRIPTS += update-grub_lib
 
 update-grub_lib: util/update-grub_lib.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x update-grub_lib
 	
 CLEANFILES += update-grub_lib
@@ -6915,7 +6915,7 @@ if COND_emu
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6926,7 +6926,7 @@ if COND_i386_pc
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6937,7 +6937,7 @@ if COND_i386_efi
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6948,7 +6948,7 @@ if COND_i386_qemu
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6959,7 +6959,7 @@ if COND_i386_coreboot
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6970,7 +6970,7 @@ if COND_i386_multiboot
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6981,7 +6981,7 @@ if COND_i386_ieee1275
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -6992,7 +6992,7 @@ if COND_x86_64_efi
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -7003,7 +7003,7 @@ if COND_mips_yeeloong
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -7014,7 +7014,7 @@ if COND_sparc64_ieee1275
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -7025,7 +7025,7 @@ if COND_powerpc_ieee1275
 bin_SCRIPTS += grub-kbdcomp
 
 grub-kbdcomp: util/grub-kbdcomp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-kbdcomp
 	
 CLEANFILES += grub-kbdcomp
@@ -7036,7 +7036,7 @@ if COND_emu
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7047,7 +7047,7 @@ if COND_i386_pc
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7058,7 +7058,7 @@ if COND_i386_efi
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7069,7 +7069,7 @@ if COND_i386_qemu
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7080,7 +7080,7 @@ if COND_i386_coreboot
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7091,7 +7091,7 @@ if COND_i386_multiboot
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7102,7 +7102,7 @@ if COND_i386_ieee1275
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7113,7 +7113,7 @@ if COND_x86_64_efi
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7124,7 +7124,7 @@ if COND_mips_yeeloong
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7135,7 +7135,7 @@ if COND_sparc64_ieee1275
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7146,7 +7146,7 @@ if COND_powerpc_ieee1275
 noinst_SCRIPTS += grub-shell
 
 grub-shell: tests/util/grub-shell.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell
 	
 CLEANFILES += grub-shell
@@ -7157,7 +7157,7 @@ if COND_emu
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7168,7 +7168,7 @@ if COND_i386_pc
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7179,7 +7179,7 @@ if COND_i386_efi
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7190,7 +7190,7 @@ if COND_i386_qemu
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7201,7 +7201,7 @@ if COND_i386_coreboot
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7212,7 +7212,7 @@ if COND_i386_multiboot
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7223,7 +7223,7 @@ if COND_i386_ieee1275
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7234,7 +7234,7 @@ if COND_x86_64_efi
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7245,7 +7245,7 @@ if COND_mips_yeeloong
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7256,7 +7256,7 @@ if COND_sparc64_ieee1275
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7267,7 +7267,7 @@ if COND_powerpc_ieee1275
 noinst_SCRIPTS += grub-shell-tester
 
 grub-shell-tester: tests/util/grub-shell-tester.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub-shell-tester
 	
 CLEANFILES += grub-shell-tester
@@ -7279,7 +7279,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7291,7 +7291,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7303,7 +7303,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7315,7 +7315,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7327,7 +7327,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7339,7 +7339,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7351,7 +7351,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7363,7 +7363,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7375,7 +7375,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7387,7 +7387,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7399,7 +7399,7 @@ check_SCRIPTS += example_scripted_test
 TESTS += example_scripted_test
 
 example_scripted_test: tests/example_scripted_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_scripted_test
 	
 CLEANFILES += example_scripted_test
@@ -7411,7 +7411,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7423,7 +7423,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7435,7 +7435,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7447,7 +7447,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7459,7 +7459,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7471,7 +7471,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7483,7 +7483,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7495,7 +7495,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7507,7 +7507,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7519,7 +7519,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7531,7 +7531,7 @@ check_SCRIPTS += example_grub_script_tes
 TESTS += example_grub_script_test
 
 example_grub_script_test: tests/example_grub_script_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x example_grub_script_test
 	
 CLEANFILES += example_grub_script_test
@@ -7543,7 +7543,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7555,7 +7555,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7567,7 +7567,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7579,7 +7579,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7591,7 +7591,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7603,7 +7603,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7615,7 +7615,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7627,7 +7627,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7639,7 +7639,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7651,7 +7651,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7663,7 +7663,7 @@ check_SCRIPTS += grub_script_echo1
 TESTS += grub_script_echo1
 
 grub_script_echo1: tests/grub_script_echo1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo1
 	
 CLEANFILES += grub_script_echo1
@@ -7675,7 +7675,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7687,7 +7687,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7699,7 +7699,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7711,7 +7711,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7723,7 +7723,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7735,7 +7735,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7747,7 +7747,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7759,7 +7759,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7771,7 +7771,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7783,7 +7783,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7795,7 +7795,7 @@ check_SCRIPTS += grub_script_echo_keywor
 TESTS += grub_script_echo_keywords
 
 grub_script_echo_keywords: tests/grub_script_echo_keywords.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_echo_keywords
 	
 CLEANFILES += grub_script_echo_keywords
@@ -7807,7 +7807,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7819,7 +7819,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7831,7 +7831,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7843,7 +7843,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7855,7 +7855,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7867,7 +7867,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7879,7 +7879,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7891,7 +7891,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7903,7 +7903,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7915,7 +7915,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7927,7 +7927,7 @@ check_SCRIPTS += grub_script_vars1
 TESTS += grub_script_vars1
 
 grub_script_vars1: tests/grub_script_vars1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_vars1
 	
 CLEANFILES += grub_script_vars1
@@ -7939,7 +7939,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -7951,7 +7951,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -7963,7 +7963,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -7975,7 +7975,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -7987,7 +7987,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -7999,7 +7999,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -8011,7 +8011,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -8023,7 +8023,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -8035,7 +8035,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -8047,7 +8047,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -8059,7 +8059,7 @@ check_SCRIPTS += grub_script_for1
 TESTS += grub_script_for1
 
 grub_script_for1: tests/grub_script_for1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_for1
 	
 CLEANFILES += grub_script_for1
@@ -8071,7 +8071,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8083,7 +8083,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8095,7 +8095,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8107,7 +8107,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8119,7 +8119,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8131,7 +8131,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8143,7 +8143,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8155,7 +8155,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8167,7 +8167,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8179,7 +8179,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8191,7 +8191,7 @@ check_SCRIPTS += grub_script_while1
 TESTS += grub_script_while1
 
 grub_script_while1: tests/grub_script_while1.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_while1
 	
 CLEANFILES += grub_script_while1
@@ -8203,7 +8203,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8215,7 +8215,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8227,7 +8227,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8239,7 +8239,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8251,7 +8251,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8263,7 +8263,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8275,7 +8275,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8287,7 +8287,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8299,7 +8299,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8311,7 +8311,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8323,7 +8323,7 @@ check_SCRIPTS += grub_script_if
 TESTS += grub_script_if
 
 grub_script_if: tests/grub_script_if.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_if
 	
 CLEANFILES += grub_script_if
@@ -8335,7 +8335,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8347,7 +8347,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8359,7 +8359,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8371,7 +8371,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8383,7 +8383,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8395,7 +8395,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8407,7 +8407,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8419,7 +8419,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8431,7 +8431,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8443,7 +8443,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8455,7 +8455,7 @@ check_SCRIPTS += grub_script_blanklines
 TESTS += grub_script_blanklines
 
 grub_script_blanklines: tests/grub_script_blanklines.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blanklines
 	
 CLEANFILES += grub_script_blanklines
@@ -8467,7 +8467,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8479,7 +8479,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8491,7 +8491,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8503,7 +8503,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8515,7 +8515,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8527,7 +8527,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8539,7 +8539,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8551,7 +8551,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8563,7 +8563,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8575,7 +8575,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8587,7 +8587,7 @@ check_SCRIPTS += grub_script_final_semic
 TESTS += grub_script_final_semicolon
 
 grub_script_final_semicolon: tests/grub_script_final_semicolon.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_final_semicolon
 	
 CLEANFILES += grub_script_final_semicolon
@@ -8599,7 +8599,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8611,7 +8611,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8623,7 +8623,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8635,7 +8635,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8647,7 +8647,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8659,7 +8659,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8671,7 +8671,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8683,7 +8683,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8695,7 +8695,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8707,7 +8707,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8719,7 +8719,7 @@ check_SCRIPTS += grub_script_dollar
 TESTS += grub_script_dollar
 
 grub_script_dollar: tests/grub_script_dollar.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_dollar
 	
 CLEANFILES += grub_script_dollar
@@ -8731,7 +8731,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8743,7 +8743,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8755,7 +8755,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8767,7 +8767,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8779,7 +8779,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8791,7 +8791,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8803,7 +8803,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8815,7 +8815,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8827,7 +8827,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8839,7 +8839,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8851,7 +8851,7 @@ check_SCRIPTS += grub_script_comments
 TESTS += grub_script_comments
 
 grub_script_comments: tests/grub_script_comments.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_comments
 	
 CLEANFILES += grub_script_comments
@@ -8863,7 +8863,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8875,7 +8875,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8887,7 +8887,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8899,7 +8899,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8911,7 +8911,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8923,7 +8923,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8935,7 +8935,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8947,7 +8947,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8959,7 +8959,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8971,7 +8971,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8983,7 +8983,7 @@ check_SCRIPTS += grub_script_functions
 TESTS += grub_script_functions
 
 grub_script_functions: tests/grub_script_functions.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_functions
 	
 CLEANFILES += grub_script_functions
@@ -8995,7 +8995,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9007,7 +9007,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9019,7 +9019,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9031,7 +9031,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9043,7 +9043,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9055,7 +9055,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9067,7 +9067,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9079,7 +9079,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9091,7 +9091,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9103,7 +9103,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9115,7 +9115,7 @@ check_SCRIPTS += grub_script_break
 TESTS += grub_script_break
 
 grub_script_break: tests/grub_script_break.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_break
 	
 CLEANFILES += grub_script_break
@@ -9127,7 +9127,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9139,7 +9139,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9151,7 +9151,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9163,7 +9163,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9175,7 +9175,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9187,7 +9187,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9199,7 +9199,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9211,7 +9211,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9223,7 +9223,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9235,7 +9235,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9247,7 +9247,7 @@ check_SCRIPTS += grub_script_continue
 TESTS += grub_script_continue
 
 grub_script_continue: tests/grub_script_continue.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_continue
 	
 CLEANFILES += grub_script_continue
@@ -9259,7 +9259,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9271,7 +9271,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9283,7 +9283,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9295,7 +9295,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9307,7 +9307,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9319,7 +9319,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9331,7 +9331,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9343,7 +9343,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9355,7 +9355,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9367,7 +9367,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9379,7 +9379,7 @@ check_SCRIPTS += grub_script_shift
 TESTS += grub_script_shift
 
 grub_script_shift: tests/grub_script_shift.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_shift
 	
 CLEANFILES += grub_script_shift
@@ -9391,7 +9391,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9403,7 +9403,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9415,7 +9415,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9427,7 +9427,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9439,7 +9439,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9451,7 +9451,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9463,7 +9463,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9475,7 +9475,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9487,7 +9487,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9499,7 +9499,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9511,7 +9511,7 @@ check_SCRIPTS += grub_script_blockarg
 TESTS += grub_script_blockarg
 
 grub_script_blockarg: tests/grub_script_blockarg.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_blockarg
 	
 CLEANFILES += grub_script_blockarg
@@ -9523,7 +9523,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9535,7 +9535,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9547,7 +9547,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9559,7 +9559,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9571,7 +9571,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9583,7 +9583,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9595,7 +9595,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9607,7 +9607,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9619,7 +9619,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9631,7 +9631,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9643,7 +9643,7 @@ check_SCRIPTS += grub_script_setparams
 TESTS += grub_script_setparams
 
 grub_script_setparams: tests/grub_script_setparams.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_setparams
 	
 CLEANFILES += grub_script_setparams
@@ -9655,7 +9655,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9667,7 +9667,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9679,7 +9679,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9691,7 +9691,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9703,7 +9703,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9715,7 +9715,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9727,7 +9727,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9739,7 +9739,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9751,7 +9751,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9763,7 +9763,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9775,7 +9775,7 @@ check_SCRIPTS += grub_script_return
 TESTS += grub_script_return
 
 grub_script_return: tests/grub_script_return.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_return
 	
 CLEANFILES += grub_script_return
@@ -9787,7 +9787,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9799,7 +9799,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9811,7 +9811,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9823,7 +9823,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9835,7 +9835,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9847,7 +9847,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9859,7 +9859,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9871,7 +9871,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9883,7 +9883,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9895,7 +9895,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9907,7 +9907,7 @@ check_SCRIPTS += grub_cmd_regexp
 TESTS += grub_cmd_regexp
 
 grub_cmd_regexp: tests/grub_cmd_regexp.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_regexp
 	
 CLEANFILES += grub_cmd_regexp
@@ -9919,7 +9919,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -9931,7 +9931,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -9943,7 +9943,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -9955,7 +9955,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -9967,7 +9967,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -9979,7 +9979,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -9991,7 +9991,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -10003,7 +10003,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -10015,7 +10015,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -10027,7 +10027,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -10039,7 +10039,7 @@ check_SCRIPTS += grub_script_expansion
 TESTS += grub_script_expansion
 
 grub_script_expansion: tests/grub_script_expansion.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_expansion
 	
 CLEANFILES += grub_script_expansion
@@ -10051,7 +10051,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10063,7 +10063,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10075,7 +10075,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10087,7 +10087,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10099,7 +10099,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10111,7 +10111,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10123,7 +10123,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10135,7 +10135,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10147,7 +10147,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10159,7 +10159,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10171,7 +10171,7 @@ check_SCRIPTS += grub_script_not
 TESTS += grub_script_not
 
 grub_script_not: tests/grub_script_not.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_script_not
 	
 CLEANFILES += grub_script_not
@@ -10183,7 +10183,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10195,7 +10195,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10207,7 +10207,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10219,7 +10219,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10231,7 +10231,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10243,7 +10243,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10255,7 +10255,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10267,7 +10267,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10279,7 +10279,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10291,7 +10291,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10303,7 +10303,7 @@ check_SCRIPTS += partmap_test
 TESTS += partmap_test
 
 partmap_test: tests/partmap_test.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x partmap_test
 	
 CLEANFILES += partmap_test
@@ -10315,7 +10315,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10327,7 +10327,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10339,7 +10339,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10351,7 +10351,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10363,7 +10363,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10375,7 +10375,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10387,7 +10387,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10399,7 +10399,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10411,7 +10411,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10423,7 +10423,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
@@ -10435,7 +10435,7 @@ check_SCRIPTS += grub_cmd_echo
 TESTS += grub_cmd_echo
 
 grub_cmd_echo: tests/grub_cmd_echo.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x grub_cmd_echo
 	
 CLEANFILES += grub_cmd_echo
Index: grub-1.99/gentpl.py
===================================================================
--- grub-1.99.orig/gentpl.py
+++ grub-1.99/gentpl.py
@@ -440,7 +440,7 @@ def script(platform):
     r += "[+ ENDIF +]"
 
     r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
-$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 chmod a+x [+ name +]
 """)
 
Index: grub-1.99/grub-core/Makefile.core.am
===================================================================
--- grub-1.99.orig/grub-core/Makefile.core.am
+++ grub-1.99/grub-core/Makefile.core.am
@@ -38846,7 +38846,7 @@ if COND_emu
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38857,7 +38857,7 @@ if COND_i386_pc
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38868,7 +38868,7 @@ if COND_i386_efi
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38879,7 +38879,7 @@ if COND_i386_qemu
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38890,7 +38890,7 @@ if COND_i386_coreboot
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38901,7 +38901,7 @@ if COND_i386_multiboot
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38912,7 +38912,7 @@ if COND_i386_ieee1275
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38923,7 +38923,7 @@ if COND_x86_64_efi
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38934,7 +38934,7 @@ if COND_mips_yeeloong
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38945,7 +38945,7 @@ if COND_sparc64_ieee1275
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38956,7 +38956,7 @@ if COND_powerpc_ieee1275
 noinst_SCRIPTS += gensyminfo.sh
 
 gensyminfo.sh: gensyminfo.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x gensyminfo.sh
 	
 CLEANFILES += gensyminfo.sh
@@ -38967,7 +38967,7 @@ if COND_emu
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -38978,7 +38978,7 @@ if COND_i386_pc
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -38989,7 +38989,7 @@ if COND_i386_efi
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39000,7 +39000,7 @@ if COND_i386_qemu
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39011,7 +39011,7 @@ if COND_i386_coreboot
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39022,7 +39022,7 @@ if COND_i386_multiboot
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39033,7 +39033,7 @@ if COND_i386_ieee1275
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39044,7 +39044,7 @@ if COND_x86_64_efi
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39055,7 +39055,7 @@ if COND_mips_yeeloong
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39066,7 +39066,7 @@ if COND_sparc64_ieee1275
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh
@@ -39077,7 +39077,7 @@ if COND_powerpc_ieee1275
 noinst_SCRIPTS += genmod.sh
 
 genmod.sh: genmod.sh.in  $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
 	chmod a+x genmod.sh
 	
 CLEANFILES += genmod.sh