[CONSOLIDATED PULL 00/33] patches and staticdev fixes

[CONSOLIDATED PULL 00/33] patches and staticdev fixes

[Saul Wold]

Richard,

Here is a batch of fixes from the community along with some
staticdev patches (long overdue).

Thanks
	Sau!

The following changes since commit a0f5dd25a37fe3b8664c2133e80b6214559f93f6:

  package_rpm.bbclass: Add support for filenames with spaces (2012-01-17 16:20:46 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Andrea Adami (1):
  xinput: add utility for configuring and testing XInput devices.

Andrei Gherzan (3):
  busybox: defconfig modified in order to activate
    CONFIG_EXPR_MATH_SUPPORT_64
  chkconfig: Update package from v1.3.55 to v1.3.57
  libsoup: Update package from v2.2.100 to v2.2.105

Bruce Ashfield (1):
  linux-yocto: restore WORKDIR as a patch source directory

Joshua Lock (6):
  busybox: drop MARKINT option from init script and syslog-startup.conf
  busybox: remove incorrect comments from syslog-startup.conf
  busybox: enable log level configuration in syslog-startup.conf and
    script
  busybox: change syslog default to log to a file
  busybox: enable dropping of duplicates in syslog, off by default
  distro-tracking-fields: claim responsibility for udev, dpkg, apt,
    v86d

Khem Raj (4):
  gnutls: Fix compilation on uclibc
  uclibc: Upgrade to latest master
  e2fsprogs_1.42.bb: Fix build fallout for uclibc
  gnutls: Fix configure issue wrt to rm

Lianhao Lu (1):
  adt-installer: install autoconf(/automake)-nativesdk

Nitin A Kamble (7):
  site/ix86-common: fix an error
  bdwgc: new recipe for autogen
  libunistring: new recipe for autogen
  guile: new recipe for autogen
  autogen-native: new recipe for grub-efi-native
  grub-efi-native: fix errors with automake 1.11.2
  distro-tracking: add data for newer recipes

Saul Wold (10):
  m4: A better refactoring
  pango.inc: fix /etc/pango -> /${sysconfdir}/pango/*
  pkgconfig: Move pkg.m4 from -dev to  package
  gst-openmax: refactor packages for staticdev
  liba52: refactor packages for staticdev
  attr/acl: refactor packages for staticdev
  db: refactor packages for staticdev
  js: refactor packages for staticdev
  boost: refactor packages for staticdev
  enchant: refactor packages for staticdev

 meta/classes/kernel-yocto.bbclass                  |    2 +
 .../conf/distro/include/distro_tracking_fields.inc |   59 +-
 .../files/grub-1.99_fix_for_automake_1.11.2.patch  | 5808 --------------------
 meta/recipes-bsp/grub/grub-efi-native_1.99.bb      |    4 +-
 meta/recipes-core/busybox/busybox-1.19.3/defconfig |    4 +-
 meta/recipes-core/busybox/busybox_1.19.3.bb        |    2 +-
 meta/recipes-core/busybox/files/syslog             |    9 +-
 .../recipes-core/busybox/files/syslog-startup.conf |    9 +-
 .../uclibc/uclibc-git/cross_compile_check.patch    |   13 +
 .../recipes-core/uclibc/uclibc-git/fix_libdl.patch |   83 +
 ...so_use_arm_dl_linux_resolve_in_thumb_mode.patch |    6 +
 .../uclibc/uclibc-git/orign_path.patch             |  183 -
 .../uclibc/uclibc-git/powerpc_copysignl.patch      |    6 +
 .../uclibc-git/remove_attribute_optimize_Os.patch  |    5 +
 meta/recipes-core/uclibc/uclibc-git/rtld_no.patch  |  216 -
 meta/recipes-core/uclibc/uclibc-git/uClibc.distro  |    2 +
 .../uclibc/uclibc-git/uclibc-arm-ftruncate64.patch |    5 +
 .../uclibc/uclibc-git/uclibc-execvpe.patch         |    3 +
 .../uclibc-git/uclibc_enable_log2_test.patch       |    5 +
 .../uclibc-git/uclibc_scheduler_update.patch       |  455 --
 meta/recipes-core/uclibc/uclibc.inc                |    2 +-
 meta/recipes-core/uclibc/uclibc_git.bb             |   10 +-
 .../autogen/autogen-native_5.12.bb                 |   24 +
 .../e2fsprogs/e2fsprogs-1.42/fallocate.patch       |   22 +
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb  |    3 +-
 ...01-Fix-the-SRFI-60-copy-bit-documentation.patch |   33 +
 ..._GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch |   25 +
 ...h-rather-than-gc-gc_version.h-in-pthread-.patch |   26 +
 .../guile/files/opensuse/guile-64bit.patch         |   38 +
 .../files/opensuse/guile-turn-off-gc-test.patch    |   48 +
 meta/recipes-devtools/guile/guile_2.0.3.bb         |   79 +
 .../adt-installer/scripts/adt_installer_internal   |   18 +-
 .../installer/adt-installer_1.0.bb                 |    2 +-
 meta/recipes-devtools/m4/m4-1.4.16.inc             |   14 +
 meta/recipes-devtools/m4/m4-1.4.9.inc              |   13 +
 meta/recipes-devtools/m4/m4-native_1.4.16.bb       |    2 +-
 meta/recipes-devtools/m4/m4-native_1.4.9.bb        |    4 +-
 meta/recipes-devtools/m4/m4.inc                    |   11 +-
 meta/recipes-devtools/m4/m4_1.4.16.bb              |    2 +-
 meta/recipes-devtools/m4/m4_1.4.9.bb               |   19 +-
 meta/recipes-devtools/pkgconfig/pkgconfig.inc      |    2 +
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb  |    2 +-
 .../{chkconfig_1.3.55.bb => chkconfig_1.3.57.bb}   |    4 +-
 meta/recipes-graphics/pango/pango.inc              |    2 +-
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb     |   14 +
 .../gstreamer/gst-openmax_0.10.1.bb                |    5 +-
 meta/recipes-multimedia/liba52/liba52_0.7.4.bb     |    4 +-
 meta/recipes-support/attr/acl_2.2.51.bb            |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb           |    2 +-
 meta/recipes-support/attr/ea-acl.inc               |   12 +-
 meta/recipes-support/bdwgc/bdwgc_20110107.bb       |   37 +
 meta/recipes-support/boost/boost.inc               |    7 +-
 meta/recipes-support/db/db_5.1.19.bb               |    6 +-
 meta/recipes-support/enchant/enchant_1.6.0.bb      |    5 +-
 .../correct_rpl_gettimeofday_signature.patch       |   57 +
 meta/recipes-support/gnutls/gnutls.inc             |    4 +-
 meta/recipes-support/gnutls/gnutls_2.12.14.bb      |    6 +-
 meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb       |    3 +-
 .../dprintf_conflict_with_eglibc.patch             | 1184 ++++
 .../{libsoup_2.2.100.bb => libsoup_2.2.105.bb}     |    9 +-
 .../libunistring/libunistring_0.9.3.bb             |   28 +
 meta/site/ix86-common                              |    2 +-
 62 files changed, 1893 insertions(+), 6778 deletions(-)
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/orign_path.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/rtld_no.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc_scheduler_update.patch
 create mode 100644 meta/recipes-devtools/autogen/autogen-native_5.12.bb
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch
 create mode 100644 meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
 create mode 100644 meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
 create mode 100644 meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
 create mode 100644 meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
 create mode 100644 meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
 create mode 100644 meta/recipes-devtools/guile/guile_2.0.3.bb
 create mode 100644 meta/recipes-devtools/m4/m4-1.4.16.inc
 create mode 100644 meta/recipes-devtools/m4/m4-1.4.9.inc
 rename meta/recipes-extended/chkconfig/{chkconfig_1.3.55.bb => chkconfig_1.3.57.bb} (84%)
 create mode 100644 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb
 create mode 100644 meta/recipes-support/bdwgc/bdwgc_20110107.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch
 create mode 100644 meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
 rename meta/recipes-support/libsoup/{libsoup_2.2.100.bb => libsoup_2.2.105.bb} (57%)
 create mode 100644 meta/recipes-support/libunistring/libunistring_0.9.3.bb

-- 
1.7.6.5

[CONSOLIDATED PULL 01/33] m4: A better refactoring

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/m4/m4-1.4.16.inc       |   14 ++++++++++++++
 meta/recipes-devtools/m4/m4-1.4.9.inc        |   13 +++++++++++++
 meta/recipes-devtools/m4/m4-native_1.4.16.bb |    2 +-
 meta/recipes-devtools/m4/m4-native_1.4.9.bb  |    4 ++--
 meta/recipes-devtools/m4/m4.inc              |   11 +----------
 meta/recipes-devtools/m4/m4_1.4.16.bb        |    2 +-
 meta/recipes-devtools/m4/m4_1.4.9.bb         |   19 +------------------
 7 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 meta/recipes-devtools/m4/m4-1.4.16.inc
 create mode 100644 meta/recipes-devtools/m4/m4-1.4.9.inc

diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc
new file mode 100644
index 0000000..139193c
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-1.4.16.inc
@@ -0,0 +1,14 @@
+require m4.inc
+
+LICENSE = "GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+	            file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
+
+PR = "r2"
+SRC_URI += "file://ac_config_links.patch"
+
+SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
+SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
+
+
diff --git a/meta/recipes-devtools/m4/m4-1.4.9.inc b/meta/recipes-devtools/m4/m4-1.4.9.inc
new file mode 100644
index 0000000..a5d243c
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-1.4.9.inc
@@ -0,0 +1,13 @@
+require m4.inc
+
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
+	file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c"
+
+PR = "r1"
+SRC_URI += "file://fix_for_circular_dependency.patch"
+
+SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5"
+SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47"
+
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.16.bb b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
index 39ed4e8..06d8aa2 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
@@ -1,4 +1,4 @@
-require m4.inc
+require m4-${PV}.inc
 
 inherit native
 
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.9.bb b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
index fa871b3..23a21d0 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.9.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
@@ -1,5 +1,4 @@
-require m4_${PV}.bb
-inherit native
+require m4-${PV}.inc
 
 INHIBIT_AUTOTOOLS_DEPS = "1"
 DEPENDS += "gnu-config-native"
@@ -10,3 +9,4 @@ do_configure()  {
 	oe_runconf
 }
 
+inherit native
diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
index bc1dacb..a130318 100644
--- a/meta/recipes-devtools/m4/m4.inc
+++ b/meta/recipes-devtools/m4/m4.inc
@@ -2,18 +2,9 @@ SUMMARY = "Traditional Unix macro processor"
 DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
 compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
 GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-	            file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
-
-PR = "r2"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
-           file://ac_config_links.patch"
-
-SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
-SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
 
 inherit autotools
 
 EXTRA_OEMAKE += "'infodir=${infodir}'"
 
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
diff --git a/meta/recipes-devtools/m4/m4_1.4.16.bb b/meta/recipes-devtools/m4/m4_1.4.16.bb
index bb4ca35..b12c0ad 100644
--- a/meta/recipes-devtools/m4/m4_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.16.bb
@@ -1,3 +1,3 @@
-require m4.inc
+require m4-${PV}.inc
 
 BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/m4/m4_1.4.9.bb b/meta/recipes-devtools/m4/m4_1.4.9.bb
index e79239b..b12c0ad 100644
--- a/meta/recipes-devtools/m4/m4_1.4.9.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.9.bb
@@ -1,20 +1,3 @@
-SUMMARY = "Traditional Unix macro processor"
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
-compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
-GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
-	file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c"
-
-PR = "r1"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
-	file://fix_for_circular_dependency.patch "
-
-SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5"
-SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47"
-
-inherit autotools
-
-EXTRA_OEMAKE += "'infodir=${infodir}'"
+require m4-${PV}.inc
 
 BBCLASSEXTEND = "nativesdk"
-- 
1.7.6.5

[CONSOLIDATED PULL 02/33] busybox: defconfig modified in order to activate CONFIG_EXPR_MATH_SUPPORT_64

[Saul Wold]

From: Andrei Gherzan <andrei.gherzan@windriver.com>

Enable 64-bit math support in the expr applet. This will make
the applet slightly larger, but will allow computation with very
large numbers.

[YOCTO #1767]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/recipes-core/busybox/busybox-1.19.3/defconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
index 1990f28..ebd751d 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
@@ -214,7 +214,7 @@ CONFIG_FEATURE_ENV_LONG_OPTIONS=y
 # CONFIG_EXPAND is not set
 # CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
 CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
 # CONFIG_FSYNC is not set
-- 
1.7.6.5

[CONSOLIDATED PULL 03/33] pango.inc: fix /etc/pango -> /${sysconfdir}/pango/*

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/pango/pango.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index ce8b6ba..516153c 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -57,6 +57,6 @@ python populate_packages_prepend () {
 	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
 }
 
-FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
 FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
-- 
1.7.6.5

[CONSOLIDATED PULL 04/33] busybox: drop MARKINT option from init script and syslog-startup.conf

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

This option has been disabled in busybox since 2007 as it was deemed too
buggy. See:

http://git.busybox.net/busybox/commit/?id=4998c818919477d90674a3f220e7407c26da17f9

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-core/busybox/files/syslog             |    3 ---
 .../recipes-core/busybox/files/syslog-startup.conf |    1 -
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index 5ff6599..0be412b 100644
--- a/meta/recipes-core/busybox/files/syslog
+++ b/meta/recipes-core/busybox/files/syslog
@@ -37,9 +37,6 @@ if [ -f /etc/syslog-startup.conf ]; then
 	if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -L"
 	fi
-	if [ -n "$MARKINT" ]; then
-		SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT"
-	fi
 	if [ "$REDUCE" = "yes" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -S"
 	fi
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index 903a60c..1e4c559 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -2,7 +2,6 @@
 # /etc/init.d/syslog[.busybox] to set syslog configuration at start time.
 
 DESTINATION=buffer		# log destinations (buffer file remote)
-MARKINT=20			# interval between --mark-- entries
 LOGFILE=/var/log/messages	# where to log (file)
 REMOTE=loghost:514		# where to log (syslog remote)
 REDUCE=no			# reduce-size logging
-- 
1.7.6.5

[CONSOLIDATED PULL 05/33] busybox: remove incorrect comments from syslog-startup.conf

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

Setting rotation size and generations is supported with busybox syslogd

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../recipes-core/busybox/files/syslog-startup.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index 1e4c559..f58cbe5 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -5,7 +5,7 @@ DESTINATION=buffer		# log destinations (buffer file remote)
 LOGFILE=/var/log/messages	# where to log (file)
 REMOTE=loghost:514		# where to log (syslog remote)
 REDUCE=no			# reduce-size logging
-#ROTATESIZE=0			# rotate log if grown beyond X [kByte] (incompatible with busybox)
-#ROTATEGENS=3			# keep X generations of rotated logs (incompatible with busybox)
+#ROTATESIZE=0			# rotate log if grown beyond X [kByte]
+#ROTATEGENS=3			# keep X generations of rotated logs
 BUFFERSIZE=64			# size of circular buffer [kByte]
 FOREGROUND=no			# run in foreground (don't use!)
-- 
1.7.6.5

[CONSOLIDATED PULL 06/33] busybox: enable log level configuration in syslog-startup.conf and script

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

It's possible to configure busybox syslog to only log messages above a
certain level, expose this functionality through the syslog-startup.conf
and syslog init script.

Valid values are 1-8 inclusive.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-core/busybox/files/syslog             |    3 +++
 .../recipes-core/busybox/files/syslog-startup.conf |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index 0be412b..deeea8b 100644
--- a/meta/recipes-core/busybox/files/syslog
+++ b/meta/recipes-core/busybox/files/syslog
@@ -40,6 +40,9 @@ if [ -f /etc/syslog-startup.conf ]; then
 	if [ "$REDUCE" = "yes" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -S"
 	fi
+	if [ -n "$LOGLEVEL" ]; then
+	    SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
+	fi
 else
 	# default: log to 16K shm circular buffer
 	SYSLOG_ARGS="-C"
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index f58cbe5..83b86f2 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -9,3 +9,4 @@ REDUCE=no			# reduce-size logging
 #ROTATEGENS=3			# keep X generations of rotated logs
 BUFFERSIZE=64			# size of circular buffer [kByte]
 FOREGROUND=no			# run in foreground (don't use!)
+#LOGLEVEL=5			# local log level (between 1 and 8)
-- 
1.7.6.5

[CONSOLIDATED PULL 07/33] busybox: change syslog default to log to a file

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

This changes the default in syslog-startup.conf to log messages
to a file (/var/log/messages) because:

a) we already mount /var/log as a volatile mount by default
b) users are accustomed to looking at /var/log/messages as
most distributions don't ship with logread

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../recipes-core/busybox/files/syslog-startup.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index 83b86f2..553490b 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -1,7 +1,7 @@
 # This configuration file is used by the busybox syslog init script,
 # /etc/init.d/syslog[.busybox] to set syslog configuration at start time.
 
-DESTINATION=buffer		# log destinations (buffer file remote)
+DESTINATION=file		# log destinations (buffer file remote)
 LOGFILE=/var/log/messages	# where to log (file)
 REMOTE=loghost:514		# where to log (syslog remote)
 REDUCE=no			# reduce-size logging
-- 
1.7.6.5

[CONSOLIDATED PULL 08/33] busybox: enable dropping of duplicates in syslog, off by default

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

Busybox syslog includes functionality to drop duplicated syslog entries,
enable this feature in the defconfig yet disable it by default.

Expose configuration of the feature through the syslog-startup.conf file
and the syslog init script.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-core/busybox/busybox-1.19.3/defconfig |    2 +-
 meta/recipes-core/busybox/busybox_1.19.3.bb        |    2 +-
 meta/recipes-core/busybox/files/syslog             |    3 +++
 .../recipes-core/busybox/files/syslog-startup.conf |    1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
index ebd751d..b474ad4 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
@@ -997,7 +997,7 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
 CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_DUP=y
 CONFIG_FEATURE_SYSLOGD_CFG=y
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 CONFIG_FEATURE_IPC_SYSLOG=y
diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb
index f591856..a075407 100644
--- a/meta/recipes-core/busybox/busybox_1.19.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index deeea8b..2944d3d 100644
--- a/meta/recipes-core/busybox/files/syslog
+++ b/meta/recipes-core/busybox/files/syslog
@@ -40,6 +40,9 @@ if [ -f /etc/syslog-startup.conf ]; then
 	if [ "$REDUCE" = "yes" ]; then
 		SYSLOG_ARGS="$SYSLOG_ARGS -S"
 	fi
+	if [ "$DROPDUPLICATES" = "yes" ]; then
+	    SYSLOG_ARGS="$SYSLOG_ARGS -D"
+	fi
 	if [ -n "$LOGLEVEL" ]; then
 	    SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
 	fi
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index 553490b..fda450a 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -5,6 +5,7 @@ DESTINATION=file		# log destinations (buffer file remote)
 LOGFILE=/var/log/messages	# where to log (file)
 REMOTE=loghost:514		# where to log (syslog remote)
 REDUCE=no			# reduce-size logging
+DROPDUPLICATES=no		# whether to drop duplicate log entries
 #ROTATESIZE=0			# rotate log if grown beyond X [kByte]
 #ROTATEGENS=3			# keep X generations of rotated logs
 BUFFERSIZE=64			# size of circular buffer [kByte]
-- 
1.7.6.5

[CONSOLIDATED PULL 09/33] chkconfig: Update package from v1.3.55 to v1.3.57

[Saul Wold]

From: Andrei Gherzan <andrei.gherzan@windriver.com>

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 .../{chkconfig_1.3.55.bb => chkconfig_1.3.57.bb}   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/chkconfig/{chkconfig_1.3.55.bb => chkconfig_1.3.57.bb} (84%)

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.57.bb
similarity index 84%
rename from meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
rename to meta/recipes-extended/chkconfig/chkconfig_1.3.57.bb
index 0e50936..b8ef2f6 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.57.bb
@@ -16,8 +16,8 @@ PR = "r0"
 
 SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "de562d5bff5116d1acf2d3191603096b"
-SRC_URI[sha256sum] = "ac5e8f6c5ed83f5b65a3dd9187f8c534f167193446082e6a6576a0d9f72ba968"
+SRC_URI[md5sum] = "35a2d0630f1cb5c251e749eefde70afd"
+SRC_URI[sha256sum] = "6a95472873984a0a8e99dca23ce9efe0ffe9db06d9990ce325575f8506babc1c"
 
 inherit autotools gettext
 
-- 
1.7.6.5

[CONSOLIDATED PULL 10/33] libsoup: Update package from v2.2.100 to v2.2.105

[Saul Wold]

From: Andrei Gherzan <andrei.gherzan@windriver.com>

I included a patch as well to solve a compile error. In this package, a dfprinf function
is declared. It will fail as eglibc provides it's function as well. So i renamed libsoup's
dprintf function into dprinfsoup.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 .../dprintf_conflict_with_eglibc.patch             | 1184 ++++++++++++++++++++
 .../{libsoup_2.2.100.bb => libsoup_2.2.105.bb}     |    9 +-
 2 files changed, 1189 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
 rename meta/recipes-support/libsoup/{libsoup_2.2.100.bb => libsoup_2.2.105.bb} (57%)

diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
new file mode 100644
index 0000000..ad13bbd
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
@@ -0,0 +1,1184 @@
+diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c
+--- libsoup-2.2.105/tests/auth-test.c	2007-12-05 00:13:27.000000000 +0200
++++ libsoup-2.2.105.new//tests/auth-test.c	2012-01-16 20:12:09.000000000 +0200
+@@ -19,7 +19,7 @@ int errors = 0;
+ gboolean debug = FALSE;
+ 
+ static void
+-dprintf (const char *format, ...)
++dprintfsoup (const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -216,18 +216,18 @@ handler (SoupMessage *msg, gpointer data
+ 
+ 	auth = identify_auth (msg);
+ 
+-	dprintf ("  %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
++	dprintfsoup ("  %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
+ 		 auths[auth]);
+ 
+ 	if (*expected) {
+ 		exp = *expected - '0';
+ 		if (auth != exp) {
+-			dprintf ("    expected %s!\n", auths[exp]);
++			dprintfsoup ("    expected %s!\n", auths[exp]);
+ 			errors++;
+ 		}
+ 		memmove (expected, expected + 1, strlen (expected));
+ 	} else {
+-		dprintf ("    expected to be finished\n");
++		dprintfsoup ("    expected to be finished\n");
+ 		errors++;
+ 	}
+ }
+@@ -266,10 +266,10 @@ bug271540_sent (SoupMessage *msg, gpoint
+ 	int auth = identify_auth (msg);
+ 
+ 	if (!*authenticated && auth) {
+-		dprintf ("    using auth on message %d before authenticating!!??\n", n);
++		dprintfsoup ("    using auth on message %d before authenticating!!??\n", n);
+ 		errors++;
+ 	} else if (*authenticated && !auth) {
+-		dprintf ("    sent unauthenticated message %d after authenticating!\n", n);
++		dprintfsoup ("    sent unauthenticated message %d after authenticating!\n", n);
+ 		errors++;
+ 	}
+ }
+@@ -287,12 +287,12 @@ bug271540_authenticate (SoupSession *ses
+ 		return;
+ 
+ 	if (!*authenticated) {
+-		dprintf ("    authenticating message %d\n", n);
++		dprintfsoup ("    authenticating message %d\n", n);
+ 		*username = g_strdup ("user1");
+ 		*password = g_strdup ("realm1");
+ 		*authenticated = TRUE;
+ 	} else {
+-		dprintf ("    asked to authenticate message %d after authenticating!\n", n);
++		dprintfsoup ("    asked to authenticate message %d after authenticating!\n", n);
+ 		errors++;
+ 	}
+ }
+@@ -304,7 +304,7 @@ bug271540_finished (SoupMessage *msg, gp
+ 	int n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (msg), "#"));
+ 
+ 	if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
+-		dprintf ("      got status '%d %s' on message %d!\n",
++		dprintfsoup ("      got status '%d %s' on message %d!\n",
+ 			msg->status_code, msg->reason_phrase, n);
+ 		errors++;
+ 	}
+@@ -350,10 +350,10 @@ main (int argc, char **argv)
+ 			  G_CALLBACK (reauthenticate), &i);
+ 
+ 	for (i = 0; i < ntests; i++) {
+-		dprintf ("Test %d: %s\n", i + 1, tests[i].explanation);
++		dprintfsoup ("Test %d: %s\n", i + 1, tests[i].explanation);
+ 
+ 		uri = g_strconcat (base_uri, tests[i].url, NULL);
+-		dprintf ("  GET %s\n", uri);
++		dprintfsoup ("  GET %s\n", uri);
+ 
+ 		msg = soup_message_new (SOUP_METHOD_GET, uri);
+ 		g_free (uri);
+@@ -372,21 +372,21 @@ main (int argc, char **argv)
+ 		soup_session_send_message (session, msg);
+ 		if (msg->status_code != SOUP_STATUS_UNAUTHORIZED &&
+ 		    msg->status_code != SOUP_STATUS_OK) {
+-			dprintf ("  %d %s !\n", msg->status_code,
++			dprintfsoup ("  %d %s !\n", msg->status_code,
+ 				msg->reason_phrase);
+ 			errors++;
+ 		}
+ 		if (*expected) {
+-			dprintf ("  expected %d more round(s)\n",
++			dprintfsoup ("  expected %d more round(s)\n",
+ 				(int)strlen (expected));
+ 			errors++;
+ 		}
+ 		g_free (expected);
+ 
+ 		if (msg->status_code != tests[i].final_status)
+-			dprintf ("  expected %d\n", tests[i].final_status);
++			dprintfsoup ("  expected %d\n", tests[i].final_status);
+ 
+-		dprintf ("\n");
++		dprintfsoup ("\n");
+ 
+ 		g_object_unref (msg);
+ 	}
+@@ -395,7 +395,7 @@ main (int argc, char **argv)
+ 
+ 	/* And now for a regression test */
+ 
+-	dprintf ("Regression test for bug 271540:\n");
++	dprintfsoup ("Regression test for bug 271540:\n");
+ 	session = soup_session_async_new ();
+ 
+ 	authenticated = FALSE;
+@@ -424,7 +424,7 @@ main (int argc, char **argv)
+ 
+ 	apache_cleanup ();
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 	if (errors) {
+ 		printf ("auth-test: %d error(s). Run with '-d' for details\n",
+ 			errors);
+diff -rupN libsoup-2.2.105/tests/context-test.c libsoup-2.2.105.new//tests/context-test.c
+--- libsoup-2.2.105/tests/context-test.c	2007-12-05 00:13:27.000000000 +0200
++++ libsoup-2.2.105.new//tests/context-test.c	2012-01-16 20:11:27.000000000 +0200
+@@ -28,7 +28,7 @@ GThread *server_thread;
+ char *base_uri;
+ 
+ static void
+-dprintf (const char *format, ...)
++dprintfsoup (const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -168,7 +168,7 @@ do_test1 (void)
+ {
+ 	GMainLoop *loop;
+ 
+-	dprintf ("Test 1: blocking the main thread does not block other thread\n");
++	dprintfsoup ("Test 1: blocking the main thread does not block other thread\n");
+ 
+ 	test1_cond = g_cond_new ();
+ 	test1_mutex = g_mutex_new ();
+@@ -196,7 +196,7 @@ idle_start_test1_thread (gpointer loop)
+ 	if (g_cond_timed_wait (test1_cond, test1_mutex, &time))
+ 		g_thread_join (thread);
+ 	else {
+-		dprintf ("  timeout!\n");
++		dprintfsoup ("  timeout!\n");
+ 		errors++;
+ 	}
+ 
+@@ -232,17 +232,17 @@ test1_thread (gpointer user_data)
+ 
+ 	uri = g_build_filename (base_uri, "slow", NULL);
+ 
+-	dprintf ("  send_message\n");
++	dprintfsoup ("  send_message\n");
+ 	msg = soup_message_new ("GET", uri);
+ 	soup_session_send_message (session, msg);
+ 	if (msg->status_code != SOUP_STATUS_OK) {
+-		dprintf ("    unexpected status: %d %s\n",
++		dprintfsoup ("    unexpected status: %d %s\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 	}
+ 	g_object_unref (msg);
+ 
+-	dprintf ("  queue_message\n");
++	dprintfsoup ("  queue_message\n");
+ 	msg = soup_message_new ("GET", uri);
+ 	loop = g_main_loop_new (async_context, FALSE);
+ 	g_object_ref (msg);
+@@ -250,7 +250,7 @@ test1_thread (gpointer user_data)
+ 	g_main_loop_run (loop);
+ 	g_main_loop_unref (loop);
+ 	if (msg->status_code != SOUP_STATUS_OK) {
+-		dprintf ("    unexpected status: %d %s\n",
++		dprintfsoup ("    unexpected status: %d %s\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 	}
+@@ -279,7 +279,7 @@ do_test2 (void)
+ 	char *uri;
+ 	SoupMessage *msg;
+ 
+-	dprintf ("Test 2: a session with its own context is independent of the main loop.\n");
++	dprintfsoup ("Test 2: a session with its own context is independent of the main loop.\n");
+ 
+ 	idle = g_idle_add_full (G_PRIORITY_HIGH, idle_test2_fail, NULL, NULL);
+ 
+@@ -291,11 +291,11 @@ do_test2 (void)
+ 
+ 	uri = g_build_filename (base_uri, "slow", NULL);
+ 
+-	dprintf ("  send_message\n");
++	dprintfsoup ("  send_message\n");
+ 	msg = soup_message_new ("GET", uri);
+ 	soup_session_send_message (session, msg);
+ 	if (msg->status_code != SOUP_STATUS_OK) {
+-		dprintf ("    unexpected status: %d %s\n",
++		dprintfsoup ("    unexpected status: %d %s\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 	}
+@@ -311,7 +311,7 @@ do_test2 (void)
+ static gboolean
+ idle_test2_fail (gpointer user_data)
+ {
+-	dprintf ("  idle ran!\n");
++	dprintfsoup ("  idle ran!\n");
+ 	errors++;
+ 	return FALSE;
+ }
+@@ -356,7 +356,7 @@ main (int argc, char **argv)
+ 	g_free (base_uri);
+ 	g_main_context_unref (g_main_context_default ());
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 	if (errors) {
+ 		printf ("context-test: %d error(s). Run with '-d' for details\n",
+ 			errors);
+diff -rupN libsoup-2.2.105/tests/header-parsing.c libsoup-2.2.105.new//tests/header-parsing.c
+--- libsoup-2.2.105/tests/header-parsing.c	2007-10-28 19:57:03.000000000 +0200
++++ libsoup-2.2.105.new//tests/header-parsing.c	2012-01-16 20:11:54.000000000 +0200
+@@ -10,7 +10,7 @@
+ gboolean debug = FALSE;
+ 
+ static void
+-dprintf (const char *format, ...)
++dprintfsoup (const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -455,7 +455,7 @@ static void
+ print_header (gpointer key, gpointer value, gpointer data)
+ {
+ 	GSList *values = value;
+-	dprintf ("              '%s': '%s'\n",
++	dprintfsoup ("              '%s': '%s'\n",
+ 		 (char *)key, (char*)values->data);
+ }
+ 
+@@ -480,11 +480,11 @@ do_request_tests (void)
+ 	SoupHttpVersion version;
+ 	GHashTable *headers;
+ 
+-	dprintf ("Request tests\n");
++	dprintfsoup ("Request tests\n");
+ 	for (i = 0; i < 1; i++) {
+ 		gboolean ok = TRUE;
+ 
+-		dprintf ("%2d. %s (%s): ", i + 1, reqtests[i].description,
++		dprintfsoup ("%2d. %s (%s): ", i + 1, reqtests[i].description,
+ 			 reqtests[i].method ? "should parse" : "should NOT parse");
+ 
+ 		headers = g_hash_table_new_full (g_str_hash, g_str_equal,
+@@ -519,34 +519,34 @@ do_request_tests (void)
+ 		}
+ 
+ 		if (ok)
+-			dprintf ("OK!\n");
++			dprintfsoup ("OK!\n");
+ 		else {
+-			dprintf ("BAD!\n");
++			dprintfsoup ("BAD!\n");
+ 			errors++;
+ 			if (reqtests[i].method) {
+-				dprintf ("    expected: '%s' '%s' 'HTTP/1.%d'\n",
++				dprintfsoup ("    expected: '%s' '%s' 'HTTP/1.%d'\n",
+ 					 reqtests[i].method, reqtests[i].path,
+ 					 reqtests[i].version);
+ 				for (h = 0; reqtests[i].headers[h].name; h++) {
+-					dprintf ("              '%s': '%s'\n",
++					dprintfsoup ("              '%s': '%s'\n",
+ 						 reqtests[i].headers[h].name,
+ 						 reqtests[i].headers[h].value);
+ 				}
+ 			} else
+-				dprintf ("    expected: parse error\n");
++				dprintfsoup ("    expected: parse error\n");
+ 			if (method) {
+-				dprintf ("         got: '%s' '%s' 'HTTP/1.%d'\n",
++				dprintfsoup ("         got: '%s' '%s' 'HTTP/1.%d'\n",
+ 					method, path, version);
+ 				g_hash_table_foreach (headers, print_header, NULL);
+ 			} else
+-				dprintf ("         got: parse error\n");
++				dprintfsoup ("         got: parse error\n");
+ 		}
+ 
+ 		g_free (method);
+ 		g_free (path);
+ 		g_hash_table_destroy (headers);
+ 	}
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 
+ 	return errors;
+ }
+@@ -561,11 +561,11 @@ do_response_tests (void)
+ 	SoupHttpVersion version;
+ 	GHashTable *headers;
+ 
+-	dprintf ("Response tests\n");
++	dprintfsoup ("Response tests\n");
+ 	for (i = 0; i < num_resptests; i++) {
+ 		gboolean ok = TRUE;
+ 
+-		dprintf ("%2d. %s (%s): ", i + 1, resptests[i].description,
++		dprintfsoup ("%2d. %s (%s): ", i + 1, resptests[i].description,
+ 			 resptests[i].reason_phrase ? "should parse" : "should NOT parse");
+ 
+ 		headers = g_hash_table_new_full (g_str_hash, g_str_equal,
+@@ -600,34 +600,34 @@ do_response_tests (void)
+ 		}
+ 
+ 		if (ok)
+-			dprintf ("OK!\n");
++			dprintfsoup ("OK!\n");
+ 		else {
+-			dprintf ("BAD!\n");
++			dprintfsoup ("BAD!\n");
+ 			errors++;
+ 			if (resptests[i].reason_phrase) {
+-				dprintf ("    expected: 'HTTP/1.%d' '%03d' '%s'\n",
++				dprintfsoup ("    expected: 'HTTP/1.%d' '%03d' '%s'\n",
+ 					 resptests[i].version,
+ 					 resptests[i].status_code,
+ 					 resptests[i].reason_phrase);
+ 				for (h = 0; resptests[i].headers[h].name; h++) {
+-					dprintf ("              '%s': '%s'\n",
++					dprintfsoup ("              '%s': '%s'\n",
+ 						 resptests[i].headers[h].name,
+ 						 resptests[i].headers[h].value);
+ 				}
+ 			} else
+-				dprintf ("    expected: parse error\n");
++				dprintfsoup ("    expected: parse error\n");
+ 			if (reason_phrase) {
+-				dprintf ("         got: 'HTTP/1.%d' '%03d' '%s'\n",
++				dprintfsoup ("         got: 'HTTP/1.%d' '%03d' '%s'\n",
+ 					 version, status_code, reason_phrase);
+ 				g_hash_table_foreach (headers, print_header, NULL);
+ 			} else
+-				dprintf ("         got: parse error\n");
++				dprintfsoup ("         got: parse error\n");
+ 		}
+ 
+ 		g_free (reason_phrase);
+ 		g_hash_table_destroy (headers);
+ 	}
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 
+ 	return errors;
+ }
+@@ -651,7 +651,7 @@ main (int argc, char **argv)
+ 	errors = do_request_tests ();
+ 	errors += do_response_tests ();
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 	if (errors) {
+ 		printf ("header-parsing: %d error(s). Run with '-d' for details\n",
+ 			errors);
+diff -rupN libsoup-2.2.105/tests/ntlm-test.c libsoup-2.2.105.new//tests/ntlm-test.c
+--- libsoup-2.2.105/tests/ntlm-test.c	2007-12-05 00:13:27.000000000 +0200
++++ libsoup-2.2.105.new//tests/ntlm-test.c	2012-01-16 20:11:45.000000000 +0200
+@@ -29,7 +29,7 @@
+ gboolean debug = FALSE;
+ 
+ static void
+-dprintf (const char *format, ...)
++dprintfsoup (const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -219,58 +219,58 @@ do_message (SoupSession *session, SoupUr
+ 			  G_CALLBACK (ntlm_response_check), &state);
+ 
+ 	soup_session_send_message (session, msg);
+-	dprintf ("  %-10s -> ", path);
++	dprintfsoup ("  %-10s -> ", path);
+ 
+ 	if (state.got_prompt) {
+-		dprintf (" PROMPT");
++		dprintfsoup (" PROMPT");
+ 		if (!get_prompt) {
+-			dprintf ("???");
++			dprintfsoup ("???");
+ 			errors++;
+ 		}
+ 	} else if (get_prompt) {
+-		dprintf (" no-prompt???");
++		dprintfsoup (" no-prompt???");
+ 		errors++;
+ 	}
+ 
+ 	if (state.sent_request) {
+-		dprintf (" REQUEST");
++		dprintfsoup (" REQUEST");
+ 		if (!do_ntlm) {
+-			dprintf ("???");
++			dprintfsoup ("???");
+ 			errors++;
+ 		}
+ 	} else if (do_ntlm) {
+-		dprintf (" no-request???");
++		dprintfsoup (" no-request???");
+ 		errors++;
+ 	}
+ 
+ 	if (state.got_challenge) {
+-		dprintf (" CHALLENGE");
++		dprintfsoup (" CHALLENGE");
+ 		if (!do_ntlm) {
+-			dprintf ("???");
++			dprintfsoup ("???");
+ 			errors++;
+ 		}
+ 	} else if (do_ntlm) {
+-		dprintf (" no-challenge???");
++		dprintfsoup (" no-challenge???");
+ 		errors++;
+ 	}
+ 
+ 	if (state.sent_response) {
+-		dprintf (" RESPONSE");
++		dprintfsoup (" RESPONSE");
+ 		if (!do_ntlm) {
+-			dprintf ("???");
++			dprintfsoup ("???");
+ 			errors++;
+ 		}
+ 	} else if (do_ntlm) {
+-		dprintf (" no-response???");
++		dprintfsoup (" no-response???");
+ 		errors++;
+ 	}
+ 
+-	dprintf (" -> %s", msg->reason_phrase);
++	dprintfsoup (" -> %s", msg->reason_phrase);
+ 	if (msg->status_code != status_code) {
+-		dprintf ("???");
++		dprintfsoup ("???");
+ 		errors++;
+ 	}
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 
+ 	g_object_unref (msg);
+ 	return errors;
+@@ -327,11 +327,11 @@ do_ntlm_tests (SoupUri *base_uri)
+ {
+ 	int errors = 0;
+ 
+-	dprintf ("Round 1: Non-NTLM Connection\n");
++	dprintfsoup ("Round 1: Non-NTLM Connection\n");
+ 	errors += do_ntlm_round (base_uri, NULL);
+-	dprintf ("Round 2: NTLM Connection, user=alice\n");
++	dprintfsoup ("Round 2: NTLM Connection, user=alice\n");
+ 	errors += do_ntlm_round (base_uri, "alice");
+-	dprintf ("Round 3: NTLM Connection, user=bob\n");
++	dprintfsoup ("Round 3: NTLM Connection, user=bob\n");
+ 	errors += do_ntlm_round (base_uri, "bob");
+ 
+ 	return errors;
+@@ -397,7 +397,7 @@ main (int argc, char **argv)
+ 	g_hash_table_destroy (connections);
+ 	g_main_context_unref (g_main_context_default ());
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 	if (errors) {
+ 		printf ("ntlm-test: %d error(s). Run with '-d' for details\n",
+ 			errors);
+diff -rupN libsoup-2.2.105/tests/proxy-test.c libsoup-2.2.105.new//tests/proxy-test.c
+--- libsoup-2.2.105/tests/proxy-test.c	2007-12-05 00:13:27.000000000 +0200
++++ libsoup-2.2.105.new//tests/proxy-test.c	2012-01-16 20:11:02.000000000 +0200
+@@ -14,7 +14,7 @@ int errors = 0;
+ gboolean debug = FALSE;
+ 
+ static void
+-dprintf (const char *format, ...)
++dprintfsoup (const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -76,7 +76,7 @@ test_url (const char *url, int proxy, gu
+ 	SoupUri *proxy_uri;
+ 	SoupMessage *msg;
+ 
+-	dprintf ("  GET %s via %s\n", url, proxy_names[proxy]);
++	dprintfsoup ("  GET %s via %s\n", url, proxy_names[proxy]);
+ 	if (proxy == UNAUTH_PROXY && expected != SOUP_STATUS_FORBIDDEN)
+ 		expected = SOUP_STATUS_PROXY_UNAUTHORIZED;
+ 
+@@ -99,9 +99,9 @@ test_url (const char *url, int proxy, gu
+ 
+ 	soup_session_send_message (session, msg);
+ 
+-	dprintf ("  %d %s\n", msg->status_code, msg->reason_phrase);
++	dprintfsoup ("  %d %s\n", msg->status_code, msg->reason_phrase);
+ 	if (msg->status_code != expected) {
+-		dprintf ("  EXPECTED %d!\n", expected);
++		dprintfsoup ("  EXPECTED %d!\n", expected);
+ 		errors++;
+ 	}
+ 
+@@ -115,7 +115,7 @@ run_test (int i, gboolean sync)
+ {
+ 	char *http_url, *https_url;
+ 
+-	dprintf ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
++	dprintfsoup ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
+ 		 sync ? "sync" : "async");
+ 
+ 	if (!strncmp (tests[i].url, "http", 4)) {
+@@ -141,7 +141,7 @@ run_test (int i, gboolean sync)
+ 	g_free (http_url);
+ 	g_free (https_url);
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ }
+ 
+ int
+@@ -176,7 +176,7 @@ main (int argc, char **argv)
+ 	apache_cleanup ();
+ 	g_main_context_unref (g_main_context_default ());
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 	if (errors) {
+ 		printf ("proxy-test: %d error(s). Run with '-d' for details\n",
+ 			errors);
+diff -rupN libsoup-2.2.105/tests/pull-api.c libsoup-2.2.105.new//tests/pull-api.c
+--- libsoup-2.2.105/tests/pull-api.c	2007-12-05 00:13:27.000000000 +0200
++++ libsoup-2.2.105.new//tests/pull-api.c	2012-01-16 20:11:14.000000000 +0200
+@@ -19,7 +19,7 @@ char *correct_response;
+ guint correct_response_len;
+ 
+ static void
+-dprintf (int level, const char *format, ...)
++dprintfsoup (int level, const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -98,7 +98,7 @@ do_fully_async_test (SoupSession *sessio
+ 	loop = g_main_loop_new (NULL, FALSE);
+ 
+ 	uri = g_build_filename (base_uri, sub_uri, NULL);
+-	dprintf (1, "GET %s\n", uri);
++	dprintfsoup (1, "GET %s\n", uri);
+ 
+ 	msg = soup_message_new (SOUP_METHOD_GET, uri);
+ 	g_free (uri);
+@@ -152,10 +152,10 @@ fully_async_request_chunk (gpointer user
+ 	FullyAsyncData *ad = user_data;
+ 
+ 	if (!ad->did_first_timeout) {
+-		dprintf (1, "  first timeout\n");
++		dprintfsoup (1, "  first timeout\n");
+ 		ad->did_first_timeout = TRUE;
+ 	} else
+-		dprintf (2, "  timeout\n");
++		dprintfsoup (2, "  timeout\n");
+ 	ad->timeout = 0;
+ 
+ 	/* ad->chunks_ready and ad->chunk_wanted are used because
+@@ -180,14 +180,14 @@ fully_async_got_headers (SoupMessage *ms
+ {
+ 	FullyAsyncData *ad = user_data;
+ 
+-	dprintf (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
++	dprintfsoup (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
+ 	if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
+ 		/* Let soup handle this one; this got_headers handler
+ 		 * will get called again next time around.
+ 		 */
+ 		return;
+ 	} else if (msg->status_code != SOUP_STATUS_OK) {
+-		dprintf (1, "  unexpected status: %d %s\n",
++		dprintfsoup (1, "  unexpected status: %d %s\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 		return;
+@@ -210,7 +210,7 @@ fully_async_got_chunk (SoupMessage *msg,
+ {
+ 	FullyAsyncData *ad = user_data;
+ 
+-	dprintf (2, "  got chunk from %lu - %lu\n",
++	dprintfsoup (2, "  got chunk from %lu - %lu\n",
+ 		 (unsigned long) ad->read_so_far,
+ 		 (unsigned long) ad->read_so_far + msg->response.length);
+ 
+@@ -227,13 +227,13 @@ fully_async_got_chunk (SoupMessage *msg,
+ 	 * somewhere.
+ 	 */
+ 	if (ad->read_so_far + msg->response.length > correct_response_len) {
+-		dprintf (1, "  read too far! (%lu > %lu)\n",
++		dprintfsoup (1, "  read too far! (%lu > %lu)\n",
+ 			 (unsigned long) (ad->read_so_far + msg->response.length),
+ 			 (unsigned long) correct_response_len);
+ 		errors++;
+ 	} else if (memcmp (msg->response.body, correct_response + ad->read_so_far,
+ 			   msg->response.length) != 0) {
+-		dprintf (1, "  data mismatch in block starting at %lu\n",
++		dprintfsoup (1, "  data mismatch in block starting at %lu\n",
+ 			 (unsigned long) ad->read_so_far);
+ 		errors++;
+ 	}
+@@ -257,7 +257,7 @@ fully_async_finished (SoupMessage *msg,
+ 	FullyAsyncData *ad = user_data;
+ 
+ 	if (msg->status_code != ad->expected_status) {
+-		dprintf (1, "  unexpected final status: %d %s !\n",
++		dprintfsoup (1, "  unexpected final status: %d %s !\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 	}
+@@ -300,7 +300,7 @@ do_synchronously_async_test (SoupSession
+ 	GByteArray *chunk;
+ 
+ 	uri = g_build_filename (base_uri, sub_uri, NULL);
+-	dprintf (1, "GET %s\n", uri);
++	dprintfsoup (1, "GET %s\n", uri);
+ 
+ 	msg = soup_message_new (SOUP_METHOD_GET, uri);
+ 	g_free (uri);
+@@ -314,11 +314,11 @@ do_synchronously_async_test (SoupSession
+ 	sync_async_send (session, msg);
+ 	if (msg->status == SOUP_MESSAGE_STATUS_FINISHED &&
+ 	    expected_status == SOUP_STATUS_OK) {
+-		dprintf (1, "  finished without reading response!\n");
++		dprintfsoup (1, "  finished without reading response!\n");
+ 		errors++;
+ 	} else if (msg->status != SOUP_MESSAGE_STATUS_FINISHED &&
+ 		   expected_status != SOUP_STATUS_OK) {
+-		dprintf (1, "  request failed to fail!\n");
++		dprintfsoup (1, "  request failed to fail!\n");
+ 		errors++;
+ 	}
+ 
+@@ -327,19 +327,19 @@ do_synchronously_async_test (SoupSession
+ 	 */
+ 	read_so_far = 0;
+ 	while ((chunk = sync_async_read_chunk (msg))) {
+-		dprintf (2, "  read chunk from %lu - %lu\n",
++		dprintfsoup (2, "  read chunk from %lu - %lu\n",
+ 			 (unsigned long) read_so_far,
+ 			 (unsigned long) read_so_far + chunk->len);
+ 
+ 		if (read_so_far + chunk->len > correct_response_len) {
+-			dprintf (1, "  read too far! (%lu > %lu)\n",
++			dprintfsoup (1, "  read too far! (%lu > %lu)\n",
+ 				 (unsigned long) read_so_far + chunk->len,
+ 				 (unsigned long) correct_response_len);
+ 			errors++;
+ 		} else if (memcmp (chunk->data,
+ 				   correct_response + read_so_far,
+ 				   chunk->len) != 0) {
+-			dprintf (1, "  data mismatch in block starting at %lu\n",
++			dprintfsoup (1, "  data mismatch in block starting at %lu\n",
+ 				 (unsigned long) read_so_far);
+ 			errors++;
+ 		}
+@@ -350,10 +350,10 @@ do_synchronously_async_test (SoupSession
+ 	if (msg->status != SOUP_MESSAGE_STATUS_FINISHED ||
+ 	    (msg->status_code == SOUP_STATUS_OK &&
+ 	     read_so_far != correct_response_len)) {
+-		dprintf (1, "  loop ended before message was fully read!\n");
++		dprintfsoup (1, "  loop ended before message was fully read!\n");
+ 		errors++;
+ 	} else if (msg->status_code != expected_status) {
+-		dprintf (1, "  unexpected final status: %d %s !\n",
++		dprintfsoup (1, "  unexpected final status: %d %s !\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 	}
+@@ -413,14 +413,14 @@ sync_async_got_headers (SoupMessage *msg
+ {
+ 	SyncAsyncData *ad = user_data;
+ 
+-	dprintf (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
++	dprintfsoup (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
+ 	if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
+ 		/* Let soup handle this one; this got_headers handler
+ 		 * will get called again next time around.
+ 		 */
+ 		return;
+ 	} else if (msg->status_code != SOUP_STATUS_OK) {
+-		dprintf (1, "  unexpected status: %d %s\n",
++		dprintfsoup (1, "  unexpected status: %d %s\n",
+ 			 msg->status_code, msg->reason_phrase);
+ 		errors++;
+ 		return;
+@@ -526,7 +526,7 @@ main (int argc, char **argv)
+ 	base_uri = "http://localhost:47524/";
+ 	get_correct_response (base_uri);
+ 
+-	dprintf (1, "\nFully async, fast requests\n");
++	dprintfsoup (1, "\nFully async, fast requests\n");
+ 	session = soup_session_async_new ();
+ 	g_signal_connect (session, "authenticate",
+ 			  G_CALLBACK (authenticate), NULL);
+@@ -539,7 +539,7 @@ main (int argc, char **argv)
+ 	soup_session_abort (session);
+ 	g_object_unref (session);
+ 
+-	dprintf (1, "\nFully async, slow requests\n");
++	dprintfsoup (1, "\nFully async, slow requests\n");
+ 	session = soup_session_async_new ();
+ 	g_signal_connect (session, "authenticate",
+ 			  G_CALLBACK (authenticate), NULL);
+@@ -552,7 +552,7 @@ main (int argc, char **argv)
+ 	soup_session_abort (session);
+ 	g_object_unref (session);
+ 
+-	dprintf (1, "\nSynchronously async\n");
++	dprintfsoup (1, "\nSynchronously async\n");
+ 	session = soup_session_async_new ();
+ 	g_signal_connect (session, "authenticate",
+ 			  G_CALLBACK (authenticate), NULL);
+@@ -571,7 +571,7 @@ main (int argc, char **argv)
+ 	apache_cleanup ();
+ 	g_main_context_unref (g_main_context_default ());
+ 
+-	dprintf (1, "\n");
++	dprintfsoup (1, "\n");
+ 	if (errors) {
+ 		printf ("pull-api: %d error(s). Run with '-d' for details\n",
+ 			errors);
+diff -rupN libsoup-2.2.105/tests/uri-parsing.c libsoup-2.2.105.new//tests/uri-parsing.c
+--- libsoup-2.2.105/tests/uri-parsing.c	2007-10-28 19:57:03.000000000 +0200
++++ libsoup-2.2.105.new//tests/uri-parsing.c	2012-01-16 20:10:35.000000000 +0200
+@@ -10,7 +10,7 @@
+ gboolean debug = FALSE;
+ 
+ static void
+-dprintf (const char *format, ...)
++dprintfsoup (const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -113,21 +113,21 @@ do_uri (SoupUri *base_uri, const char *b
+ 	char *uri_string;
+ 
+ 	if (base_uri) {
+-		dprintf ("<%s> + <%s> = <%s>? ", base_str, in_uri,
++		dprintfsoup ("<%s> + <%s> = <%s>? ", base_str, in_uri,
+ 			 out_uri ? out_uri : "ERR");
+ 		uri = soup_uri_new_with_base (base_uri, in_uri);
+ 	} else {
+-		dprintf ("<%s> => <%s>? ", in_uri,
++		dprintfsoup ("<%s> => <%s>? ", in_uri,
+ 			 out_uri ? out_uri : "ERR");
+ 		uri = soup_uri_new (in_uri);
+ 	}
+ 
+ 	if (!uri) {
+ 		if (out_uri) {
+-			dprintf ("ERR\n  Could not parse %s\n", in_uri);
++			dprintfsoup ("ERR\n  Could not parse %s\n", in_uri);
+ 			return FALSE;
+ 		} else {
+-			dprintf ("OK\n");
++			dprintfsoup ("OK\n");
+ 			return TRUE;
+ 		}
+ 	}
+@@ -136,18 +136,18 @@ do_uri (SoupUri *base_uri, const char *b
+ 	soup_uri_free (uri);
+ 
+ 	if (!out_uri) {
+-		dprintf ("ERR\n  Got %s\n", uri_string);
++		dprintfsoup ("ERR\n  Got %s\n", uri_string);
+ 		return FALSE;
+ 	}
+ 
+ 	if (strcmp (uri_string, out_uri) != 0) {
+-		dprintf ("NO\n  Unparses to <%s>\n", uri_string);
++		dprintfsoup ("NO\n  Unparses to <%s>\n", uri_string);
+ 		g_free (uri_string);
+ 		return FALSE;
+ 	}
+ 	g_free (uri_string);
+ 
+-	dprintf ("OK\n");
++	dprintfsoup ("OK\n");
+ 	return TRUE;
+ }
+ 
+@@ -169,14 +169,14 @@ main (int argc, char **argv)
+ 		}
+ 	}
+ 
+-	dprintf ("Absolute URI parsing\n");
++	dprintfsoup ("Absolute URI parsing\n");
+ 	for (i = 0; i < num_abs_tests; i++) {
+ 		if (!do_uri (NULL, NULL, abs_tests[i].uri_string,
+ 			     abs_tests[i].result))
+ 			errs++;
+ 	}
+ 
+-	dprintf ("\nRelative URI parsing\n");
++	dprintfsoup ("\nRelative URI parsing\n");
+ 	base_uri = soup_uri_new (base);
+ 	if (!base_uri) {
+ 		fprintf (stderr, "Could not parse %s!\n", base);
+@@ -198,7 +198,7 @@ main (int argc, char **argv)
+ 	}
+ 	soup_uri_free (base_uri);
+ 
+-	dprintf ("\n");
++	dprintfsoup ("\n");
+ 	if (errs) {
+ 		printf ("uri-parsing: %d error(s). Run with '-d' for details\n",
+ 			errs);
+diff -rupN libsoup-2.2.105/tests/xmlrpc-test.c libsoup-2.2.105.new//tests/xmlrpc-test.c
+--- libsoup-2.2.105/tests/xmlrpc-test.c	2008-02-08 04:19:00.000000000 +0200
++++ libsoup-2.2.105.new//tests/xmlrpc-test.c	2012-01-16 20:12:18.000000000 +0200
+@@ -19,7 +19,7 @@ static const char *uri = "http://localho
+ int debug;
+ 
+ static void
+-dprintf (int level, const char *format, ...)
++dprintfsoup (int level, const char *format, ...)
+ {
+ 	va_list args;
+ 
+@@ -54,13 +54,13 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
+ 	soup_xmlrpc_message_persist (xmsg);
+ 	status = soup_session_send_message (session, msg);
+ 
+-	dprintf (3, "\n%.*s\n%d %s\n%.*s\n",
++	dprintfsoup (3, "\n%.*s\n%d %s\n%.*s\n",
+ 		 msg->request.length, msg->request.body,
+ 		 msg->status_code, msg->reason_phrase,
+ 		 msg->response.length, msg->response.body);
+ 
+ 	if (!SOUP_STATUS_IS_SUCCESSFUL (status)) {
+-		dprintf (1, "ERROR: %d %s\n", status, msg->reason_phrase);
++		dprintfsoup (1, "ERROR: %d %s\n", status, msg->reason_phrase);
+ 		g_object_unref (msg);
+ 		return FALSE;
+ 	}
+@@ -69,9 +69,9 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
+ 	g_object_unref (msg);
+ 	if (!response || soup_xmlrpc_response_is_fault (response)) {
+ 		if (!response)
+-			dprintf (1, "ERROR: no response\n");
++			dprintfsoup (1, "ERROR: no response\n");
+ 		else {
+-			dprintf (1, "ERROR: fault\n");
++			dprintfsoup (1, "ERROR: fault\n");
+ 			g_object_unref (response);
+ 		}
+ 		return FALSE;
+@@ -79,11 +79,11 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
+ 
+ 	value = soup_xmlrpc_response_get_value (response);
+ 	if (!value) {
+-		dprintf (1, "ERROR: no value?\n");
++		dprintfsoup (1, "ERROR: no value?\n");
+ 		g_object_unref (response);
+ 		return NULL;
+ 	} else if (soup_xmlrpc_value_get_type (value) != type) {
+-		dprintf (1, "ERROR: wrong value type; expected %s, got %s\n",
++		dprintfsoup (1, "ERROR: wrong value type; expected %s, got %s\n",
+ 			 value_type[type], value_type[soup_xmlrpc_value_get_type (value)]);
+ 		g_object_unref (response);
+ 		return NULL;
+@@ -101,7 +101,7 @@ test_sum (void)
+ 	int i, val, sum;
+ 	long result;
+ 
+-	dprintf (1, "sum (array of int -> int): ");
++	dprintfsoup (1, "sum (array of int -> int): ");
+ 
+ 	msg = soup_xmlrpc_message_new (uri);
+ 	soup_xmlrpc_message_start_call (msg, "sum");
+@@ -109,11 +109,11 @@ test_sum (void)
+ 	soup_xmlrpc_message_start_array (msg);
+ 	for (i = sum = 0; i < 10; i++) {
+ 		val = rand () % 100;
+-		dprintf (2, "%s%d", i == 0 ? "[" : ", ", val);
++		dprintfsoup (2, "%s%d", i == 0 ? "[" : ", ", val);
+ 		soup_xmlrpc_message_write_int (msg, val);
+ 		sum += val;
+ 	}
+-	dprintf (2, "] -> ");
++	dprintfsoup (2, "] -> ");
+ 	soup_xmlrpc_message_end_array (msg);
+ 	soup_xmlrpc_message_end_param (msg);
+ 	soup_xmlrpc_message_end_call (msg);
+@@ -124,14 +124,14 @@ test_sum (void)
+ 	value = soup_xmlrpc_response_get_value (response);
+ 
+ 	if (!soup_xmlrpc_value_get_int (value, &result)) {
+-		dprintf (1, "wrong type?\n");
++		dprintfsoup (1, "wrong type?\n");
+ 		g_object_unref (response);
+ 		return FALSE;
+ 	}
+ 	g_object_unref (response);
+ 
+-	dprintf (2, "%ld: ", result);
+-	dprintf (1, "%s\n", result == sum ? "OK!" : "WRONG!");
++	dprintfsoup (2, "%ld: ", result);
++	dprintfsoup (1, "%s\n", result == sum ? "OK!" : "WRONG!");
+ 	return result == sum;
+ }
+ 
+@@ -146,7 +146,7 @@ test_countBools (void)
+ 	gboolean val, ok;
+ 	GHashTable *result;
+ 
+-	dprintf (1, "countBools (array of boolean -> struct of ints): ");
++	dprintfsoup (1, "countBools (array of boolean -> struct of ints): ");
+ 
+ 	msg = soup_xmlrpc_message_new (uri);
+ 	soup_xmlrpc_message_start_call (msg, "countBools");
+@@ -154,14 +154,14 @@ test_countBools (void)
+ 	soup_xmlrpc_message_start_array (msg);
+ 	for (i = trues = falses = 0; i < 10; i++) {
+ 		val = rand () > (RAND_MAX / 2);
+-		dprintf (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
++		dprintfsoup (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
+ 		soup_xmlrpc_message_write_boolean (msg, val);
+ 		if (val)
+ 			trues++;
+ 		else
+ 			falses++;
+ 	}
+-	dprintf (2, "] -> ");
++	dprintfsoup (2, "] -> ");
+ 	soup_xmlrpc_message_end_array (msg);
+ 	soup_xmlrpc_message_end_param (msg);
+ 	soup_xmlrpc_message_end_call (msg);
+@@ -172,19 +172,19 @@ test_countBools (void)
+ 	value = soup_xmlrpc_response_get_value (response);
+ 
+ 	if (!soup_xmlrpc_value_get_struct (value, &result)) {
+-		dprintf (1, "wrong type?\n");
++		dprintfsoup (1, "wrong type?\n");
+ 		g_object_unref (response);
+ 		return FALSE;
+ 	}
+ 
+ 	if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "true"), &ret_trues)) {
+-		dprintf (1, "NO 'true' value in response\n");
++		dprintfsoup (1, "NO 'true' value in response\n");
+ 		g_hash_table_destroy (result);
+ 		g_object_unref (response);
+ 		return FALSE;
+ 	}
+ 	if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "false"), &ret_falses)) {
+-		dprintf (1, "NO 'false' value in response\n");
++		dprintfsoup (1, "NO 'false' value in response\n");
+ 		g_hash_table_destroy (result);
+ 		g_object_unref (response);
+ 		return FALSE;
+@@ -192,9 +192,9 @@ test_countBools (void)
+ 	g_hash_table_destroy (result);
+ 	g_object_unref (response);
+ 
+-	dprintf (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
++	dprintfsoup (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
+ 	ok = (trues == ret_trues) && (falses == ret_falses);
+-	dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
++	dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
+ 	return ok;
+ }
+ 
+@@ -211,7 +211,7 @@ test_md5sum (void)
+ 	guchar digest[16];
+ 	gboolean ok;
+ 
+-	dprintf (1, "md5sum (base64 -> base64): ");
++	dprintfsoup (1, "md5sum (base64 -> base64): ");
+ 
+ 	msg = soup_xmlrpc_message_new (uri);
+ 	soup_xmlrpc_message_start_call (msg, "md5sum");
+@@ -228,14 +228,14 @@ test_md5sum (void)
+ 	value = soup_xmlrpc_response_get_value (response);
+ 
+ 	if (!soup_xmlrpc_value_get_base64 (value, &result)) {
+-		dprintf (1, "wrong type?\n");
++		dprintfsoup (1, "wrong type?\n");
+ 		g_object_unref (response);
+ 		return FALSE;
+ 	}
+ 	g_object_unref (response);
+ 
+ 	if (result->len != 16) {
+-		dprintf (1, "result has WRONG length (%d)\n", result->len);
++		dprintfsoup (1, "result has WRONG length (%d)\n", result->len);
+ 		g_byte_array_free (result, TRUE);
+ 		return FALSE;
+ 	}
+@@ -245,7 +245,7 @@ test_md5sum (void)
+ 	soup_md5_final (&md5, digest);
+ 
+ 	ok = (memcmp (digest, result->data, 16) == 0);
+-	dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
++	dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
+ 	g_byte_array_free (result, TRUE);
+ 	return ok;
+ }
+@@ -260,7 +260,7 @@ test_dateChange (void)
+ 	time_t when, result;
+ 	char timestamp[128];
+ 
+-	dprintf (1, "dateChange (struct of time and ints -> time): ");
++	dprintfsoup (1, "dateChange (struct of time and ints -> time): ");
+ 
+ 	msg = soup_xmlrpc_message_new (uri);
+ 	soup_xmlrpc_message_start_call (msg, "dateChange");
+@@ -281,53 +281,53 @@ test_dateChange (void)
+ 
+ 	strftime (timestamp, sizeof (timestamp),
+ 		  "%Y-%m-%dT%H:%M:%S", &tm);
+-	dprintf (2, "{ date: %s", timestamp);
++	dprintfsoup (2, "{ date: %s", timestamp);
+ 
+ 	if (rand () % 3) {
+ 		tm.tm_year = 70 + (rand () % 50);
+-		dprintf (2, ", tm_year: %d", tm.tm_year);
++		dprintfsoup (2, ", tm_year: %d", tm.tm_year);
+ 		soup_xmlrpc_message_start_member (msg, "tm_year");
+ 		soup_xmlrpc_message_write_int (msg, tm.tm_year);
+ 		soup_xmlrpc_message_end_member (msg);
+ 	}
+ 	if (rand () % 3) {
+ 		tm.tm_mon = rand () % 12;
+-		dprintf (2, ", tm_mon: %d", tm.tm_mon);
++		dprintfsoup (2, ", tm_mon: %d", tm.tm_mon);
+ 		soup_xmlrpc_message_start_member (msg, "tm_mon");
+ 		soup_xmlrpc_message_write_int (msg, tm.tm_mon);
+ 		soup_xmlrpc_message_end_member (msg);
+ 	}
+ 	if (rand () % 3) {
+ 		tm.tm_mday = 1 + (rand () % 28);
+-		dprintf (2, ", tm_mday: %d", tm.tm_mday);
++		dprintfsoup (2, ", tm_mday: %d", tm.tm_mday);
+ 		soup_xmlrpc_message_start_member (msg, "tm_mday");
+ 		soup_xmlrpc_message_write_int (msg, tm.tm_mday);
+ 		soup_xmlrpc_message_end_member (msg);
+ 	}
+ 	if (rand () % 3) {
+ 		tm.tm_hour = rand () % 24;
+-		dprintf (2, ", tm_hour: %d", tm.tm_hour);
++		dprintfsoup (2, ", tm_hour: %d", tm.tm_hour);
+ 		soup_xmlrpc_message_start_member (msg, "tm_hour");
+ 		soup_xmlrpc_message_write_int (msg, tm.tm_hour);
+ 		soup_xmlrpc_message_end_member (msg);
+ 	}
+ 	if (rand () % 3) {
+ 		tm.tm_min = rand () % 60;
+-		dprintf (2, ", tm_min: %d", tm.tm_min);
++		dprintfsoup (2, ", tm_min: %d", tm.tm_min);
+ 		soup_xmlrpc_message_start_member (msg, "tm_min");
+ 		soup_xmlrpc_message_write_int (msg, tm.tm_min);
+ 		soup_xmlrpc_message_end_member (msg);
+ 	}
+ 	if (rand () % 3) {
+ 		tm.tm_sec = rand () % 60;
+-		dprintf (2, ", tm_sec: %d", tm.tm_sec);
++		dprintfsoup (2, ", tm_sec: %d", tm.tm_sec);
+ 		soup_xmlrpc_message_start_member (msg, "tm_sec");
+ 		soup_xmlrpc_message_write_int (msg, tm.tm_sec);
+ 		soup_xmlrpc_message_end_member (msg);
+ 	}
+ 	when = soup_mktime_utc (&tm);
+ 
+-	dprintf (2, " } -> ");
++	dprintfsoup (2, " } -> ");
+ 
+ 	soup_xmlrpc_message_end_struct (msg);
+ 	soup_xmlrpc_message_end_param (msg);
+@@ -339,7 +339,7 @@ test_dateChange (void)
+ 	value = soup_xmlrpc_response_get_value (response);
+ 
+ 	if (!soup_xmlrpc_value_get_datetime (value, &result)) {
+-		dprintf (1, "wrong type?\n");
++		dprintfsoup (1, "wrong type?\n");
+ 		g_object_unref (response);
+ 		return FALSE;
+ 	}
+@@ -348,9 +348,9 @@ test_dateChange (void)
+ 	memset (&tm, 0, sizeof (tm));
+ 	soup_gmtime (&result, &tm);
+ 	strftime (timestamp, sizeof (timestamp), "%Y-%m-%dT%H:%M:%S", &tm);
+-	dprintf (2, "%s: ", timestamp);
++	dprintfsoup (2, "%s: ", timestamp);
+ 
+-	dprintf (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
++	dprintfsoup (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
+ 	return (when == result);
+ }
+ 
+@@ -372,17 +372,17 @@ test_echo (void)
+ 	char *echo;
+ 	int i;
+ 
+-	dprintf (1, "echo (array of string -> array of string): ");
++	dprintfsoup (1, "echo (array of string -> array of string): ");
+ 
+ 	msg = soup_xmlrpc_message_new (uri);
+ 	soup_xmlrpc_message_start_call (msg, "echo");
+ 	soup_xmlrpc_message_start_param (msg);
+ 	soup_xmlrpc_message_start_array (msg);
+ 	for (i = 0; i < N_ECHO_STRINGS; i++) {
+-		dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
++		dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
+ 		soup_xmlrpc_message_write_string (msg, echo_strings[i]);
+ 	}
+-	dprintf (2, "] -> ");
++	dprintfsoup (2, "] -> ");
+ 	soup_xmlrpc_message_end_array (msg);
+ 	soup_xmlrpc_message_end_param (msg);
+ 	soup_xmlrpc_message_end_call (msg);
+@@ -393,25 +393,25 @@ test_echo (void)
+ 	value = soup_xmlrpc_response_get_value (response);
+ 
+ 	if (!soup_xmlrpc_value_array_get_iterator (value, &iter)) {
+-		dprintf (1, "wrong type?\n");
++		dprintfsoup (1, "wrong type?\n");
+ 		g_object_unref (response);
+ 		return FALSE;
+ 	}
+ 	i = 0;
+ 	while (iter) {
+ 		if (!soup_xmlrpc_value_array_iterator_get_value (iter, &elt)) {
+-			dprintf (1, " WRONG! Can't get result element %d\n", i + 1);
++			dprintfsoup (1, " WRONG! Can't get result element %d\n", i + 1);
+ 			g_object_unref (response);
+ 			return FALSE;
+ 		}
+ 		if (!soup_xmlrpc_value_get_string (elt, &echo)) {
+-			dprintf (1, " WRONG! Result element %d is not a string", i + 1);
++			dprintfsoup (1, " WRONG! Result element %d is not a string", i + 1);
+ 			g_object_unref (response);
+ 			return FALSE;
+ 		}
+-		dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
++		dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
+ 		if (strcmp (echo_strings[i], echo) != 0) {
+-			dprintf (1, " WRONG! Mismatch at %d\n", i + 1);
++			dprintfsoup (1, " WRONG! Mismatch at %d\n", i + 1);
+ 			g_free (echo);
+ 			g_object_unref (response);
+ 			return FALSE;
+@@ -421,10 +421,10 @@ test_echo (void)
+ 		iter = soup_xmlrpc_value_array_iterator_next (iter);
+ 		i++;
+ 	}
+-	dprintf (2, "] ");
++	dprintfsoup (2, "] ");
+ 	g_object_unref (response);
+ 
+-	dprintf (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
++	dprintfsoup (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
+ 	return i == N_ECHO_STRINGS;
+ }
+ 
+@@ -480,7 +480,7 @@ main (int argc, char **argv)
+ 
+ 	apache_cleanup ();
+ 
+-	dprintf (1, "\n");
++	dprintfsoup (1, "\n");
+ 	if (errors) {
+ 		printf ("xmlrpc-test: %d error(s). Run with '-d' for details\n",
+ 			errors);
diff --git a/meta/recipes-support/libsoup/libsoup_2.2.100.bb b/meta/recipes-support/libsoup/libsoup_2.2.105.bb
similarity index 57%
rename from meta/recipes-support/libsoup/libsoup_2.2.100.bb
rename to meta/recipes-support/libsoup/libsoup_2.2.105.bb
index cc9846a..6ad90b8 100644
--- a/meta/recipes-support/libsoup/libsoup_2.2.100.bb
+++ b/meta/recipes-support/libsoup/libsoup_2.2.105.bb
@@ -2,14 +2,15 @@ DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-PR = "r1"
+PR = "r0"
 
 DEPENDS = "glib-2.0 gnutls libxml2"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/2.2/${BPN}-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/2.2/${BPN}-${PV}.tar.bz2 \
+	    file://dprintf_conflict_with_eglibc.patch"
 
-SRC_URI[md5sum] = "936e29d705aab0483b9a5b8860f68c13"
-SRC_URI[sha256sum] = "fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d"
+SRC_URI[md5sum] = "7fa48b06a0e2b0ff3d2fa45cf331f169"
+SRC_URI[sha256sum] = "3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f"
 
 inherit autotools pkgconfig
 
-- 
1.7.6.5

[CONSOLIDATED PULL 11/33] gnutls: Fix compilation on uclibc

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

Examples do not compile correctly on latest uclibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../correct_rpl_gettimeofday_signature.patch       |   57 ++++++++++++++++++++
 meta/recipes-support/gnutls/gnutls_2.12.14.bb      |    6 ++-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch

diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch
new file mode 100644
index 0000000..b8f0d72
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch
@@ -0,0 +1,57 @@
+Currently we fail on uclibc like below
+
+| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,
+|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
+|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
+|                  from ../../gl/signal.h:52,
+|                  from ../../gl/sys/select.h:58,
+|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
+|                  from ../../gl/sys/types.h:28,
+|                  from ../../lib/includes/gnutls/gnutls.h:46,
+|                  from ex-cxx.cpp:3:
+| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
+| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
+| make[4]: *** [ex-cxx.o] Error 1
+| make[4]: *** Waiting for unfinished jobs....
+
+
+GCC detects that we call 'restrict' as param name in function
+signatures and complains since both params are called 'restrict'
+therefore we use __restrict to denote the C99 keywork
+
+This only happens of uclibc since this code is not excercised with
+eglibc otherwise we will have same issue there too
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: gnutls-2.12.14/gl/sys_time.in.h
+===================================================================
+--- gnutls-2.12.14.orig/gl/sys_time.in.h	2012-01-15 10:54:39.517285351 -0800
++++ gnutls-2.12.14/gl/sys_time.in.h	2012-01-15 10:59:23.773299108 -0800
+@@ -82,20 +82,20 @@
+ #    define gettimeofday rpl_gettimeofday
+ #   endif
+ _GL_FUNCDECL_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ _GL_CXXALIAS_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict));
++                  (struct timeval *__restrict, void *__restrict));
+ #  else
+ #   if !@HAVE_GETTIMEOFDAY@
+ _GL_FUNCDECL_SYS (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ #   endif
+ /* Need to cast, because on glibc systems, by default, the second argument is
+                                                   struct timezone *.  */
+ _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
+-                       (struct timeval *restrict, void *restrict));
++                       (struct timeval *__restrict, void *__restrict));
+ #  endif
+ _GL_CXXALIASWARN (gettimeofday);
+ # elif defined GNULIB_POSIXCHECK
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index 21fd187..6a50cec 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -1,9 +1,11 @@
 require gnutls.inc
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 SRC_URI += "file://gnutls-openssl.patch \
-            file://configure-fix.patch"
+            file://correct_rpl_gettimeofday_signature.patch \
+            file://configure-fix.patch \
+           "
 
 python() {
     if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
-- 
1.7.6.5

[CONSOLIDATED PULL 12/33] pkgconfig: Move pkg.m4 from -dev to package

[Saul Wold]

[YOCTO #1908]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 641bfae..00c23d7 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -31,3 +31,5 @@ do_configure_prepend () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN} += "${datadir}/aclocal/pkg.m4"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index 76c0df9..1d7ba49 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
 require pkgconfig.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
 SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
-- 
1.7.6.5

[CONSOLIDATED PULL 13/33] gst-openmax: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gstreamer/gst-openmax_0.10.1.bb                |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
index 776ed1c..b4fe52d 100644
--- a/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
@@ -12,10 +12,11 @@ inherit autotools
 
 EXTRA_OECONF += "--disable-valgrind"
 
-PR = "r2"
+PR = "r3"
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.la"
+FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/libgstomx.a"
 FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/"
 
 SRC_URI[md5sum] = "4d0370bfe99dea20918c84347abadb4e"
-- 
1.7.6.5

[CONSOLIDATED PULL 14/33] liba52: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-multimedia/liba52/liba52_0.7.4.bb |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
index ddc109c..a7f1fae 100644
--- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
+++ b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 			file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1"
 SECTION = "libs"
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 
@@ -19,7 +19,5 @@ EXTRA_OECONF = " --enable-shared "
 
 PACKAGES =+ "a52dec a52dec-doc"
 
-FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " 
-FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
 FILES_a52dec = " ${bindir}/* "
 FILES_a52dec-doc = " ${mandir}/man1/* "
-- 
1.7.6.5

[CONSOLIDATED PULL 15/33] attr/acl: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 40ba5f1..1c40b00 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@
 require acl.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index 85c35d0..0bc74cf 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 1fda792..0f506bc 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -17,18 +17,18 @@ do_install () {
 	oe_runmake install install-lib install-dev DIST_ROOT="${D}"
 }
 
-PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc"
+PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-doc"
 
-FILES_lib${BPN} = "${base_libdir}/lib*.so.*"
+FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
 
 FILES_lib${BPN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
+                      ${libdir}/lib*${SOLIBSDEV} \
                       ${libdir}/lib*.la \
-                      ${base_libdir}/lib*.so \
-                      ${base_libdir}/lib*.a \
+                      ${base_libdir}/lib*${SOLIBSDEV} \
                       ${base_libdir}/lib*.la"
 
+FILES_lib${BPN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"
+
 FILES_lib${BPN}-doc = "${mandir}/man2 \
                       ${mandir}/man3"
 
-- 
1.7.6.5

[CONSOLIDATED PULL 16/33] db: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/db/db_5.1.19.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.1.19.bb
index 2659826..7e84646 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.1.19.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
 SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
@@ -52,8 +52,8 @@ FILES_${PN} = "${libdir}/libdb-5*so*"
 FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
-# same time) as the db3 package
-FILES_${PN}-dev = "${includedir} ${libdir}/*"
+# same time) as the db3 package, allow the default packaging
+# to sort out ${libdir}
 
 #configuration - set in local.conf to override
 # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
-- 
1.7.6.5

[CONSOLIDATED PULL 17/33] js: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
index a4423ab..adca44e 100644
--- a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
+++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 # the package is licensed under either of the following
 LICENSE = "MPL-1 | GPLv2+ | LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://jsapi.c;beginline=4;endline=39;md5=347c6bbf4fb4547de1fa5ad830030063"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz \
            file://link_with_gcc.patch \
@@ -47,5 +47,4 @@ do_install() {
 }
 
 FILES_${PN} = "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
 
-- 
1.7.6.5

[CONSOLIDATED PULL 18/33] boost: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/boost/boost.inc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 74f3e4b..09f61c0 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 
@@ -68,8 +68,9 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
 	${libdir}/libboost_unit_test_framework*.so.*"
 
 # -dev last to pick up the remaining stuff
-PACKAGES += "${PN}-dev"
-FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+PACKAGES += "${PN}-dev ${PN}-staticdev"
+FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so"
+FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
 
 # "boost" is a metapackage which pulls in all boost librabries
 PACKAGES += "${PN}"
-- 
1.7.6.5

[CONSOLIDATED PULL 19/33] enchant: refactor packages for staticdev

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/enchant/enchant_1.6.0.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb
index a3ef379..25178f5 100644
--- a/meta/recipes-support/enchant/enchant_1.6.0.bb
+++ b/meta/recipes-support/enchant/enchant_1.6.0.bb
@@ -10,7 +10,7 @@ RDEPENDS_${PN}    = "aspell"
 
 inherit autotools pkgconfig
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
 
@@ -20,6 +20,7 @@ SRC_URI[sha256sum] = "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03
 EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell --disable-binreloc"
 
 FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/*.so"
-FILES_${PN}-dev += "${libdir}/${PN}/*{SOLIBSDEV} ${libdir}/${PN}/*.la ${libdir}/${PN}/*.a" 
+FILES_${PN}-dev += "${libdir}/${PN}/*{SOLIBSDEV} ${libdir}/${PN}/*.la" 
+FILES_${PN}-staticdev += "${libdir}/${PN}/*.a" 
 
 export CXXFLAGS += " -L${STAGING_LIBDIR} -lstdc++ "
-- 
1.7.6.5

[CONSOLIDATED PULL 20/33] site/ix86-common: fix an error

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Fixed this line
ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_int=1}

as this line
ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1}

This issue was causing guile recipe to compile-fail for x86 target.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/site/ix86-common |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index 512c9a0..e2796eb 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -1,6 +1,6 @@
 # general
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
-ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_int=1}
+ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1}
 ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
 ac_cv_sizeof_unsigned_char_p=${ac_cv_sizeof_unsigned_char_p=4}
 ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
-- 
1.7.6.5

[CONSOLIDATED PULL 21/33] linux-yocto: restore WORKDIR as a patch source directory

[Saul Wold]

From: Bruce Ashfield <bruce.ashfield@windriver.com>

In the switch to using src_patches and using patches in their
source directory, the scanning of WORKDIR migrated items like
config fragments was dropped. Adding WORKDIR back as a patch
directory restores the old functionality.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 1b73e6e..7fdefcf 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -92,6 +92,8 @@ do_patch() {
 		fi
 	done
 
+	patch_dirs="${patch_dirs} ${WORKDIR}"
+
 	# add any explicitly referenced features onto the end of the feature
 	# list that is passed to the kernel build scripts.
 	if [ -n "${KERNEL_FEATURES}" ]; then
-- 
1.7.6.5

[CONSOLIDATED PULL 22/33] uclibc: Upgrade to latest master

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

Document the patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../uclibc/uclibc-git/cross_compile_check.patch    |   13 +
 .../recipes-core/uclibc/uclibc-git/fix_libdl.patch |   83 ++++
 ...so_use_arm_dl_linux_resolve_in_thumb_mode.patch |    6 +
 .../uclibc/uclibc-git/orign_path.patch             |  183 --------
 .../uclibc/uclibc-git/powerpc_copysignl.patch      |    6 +
 .../uclibc-git/remove_attribute_optimize_Os.patch  |    5 +
 meta/recipes-core/uclibc/uclibc-git/rtld_no.patch  |  216 ---------
 meta/recipes-core/uclibc/uclibc-git/uClibc.distro  |    2 +
 .../uclibc/uclibc-git/uclibc-arm-ftruncate64.patch |    5 +
 .../uclibc/uclibc-git/uclibc-execvpe.patch         |    3 +
 .../uclibc-git/uclibc_enable_log2_test.patch       |    5 +
 .../uclibc-git/uclibc_scheduler_update.patch       |  455 --------------------
 meta/recipes-core/uclibc/uclibc.inc                |    2 +-
 meta/recipes-core/uclibc/uclibc_git.bb             |   10 +-
 14 files changed, 134 insertions(+), 860 deletions(-)
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/orign_path.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/rtld_no.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc_scheduler_update.patch

diff --git a/meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch b/meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch
new file mode 100644
index 0000000..f009cb9
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch
@@ -0,0 +1,13 @@
+diff --git a/Rules.mak b/Rules.mak
+index 84baa97..571da05 100644
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -158,7 +158,7 @@ endif
+ comma:=,
+ space:= #
+ 
+-ifndef CROSS_COMPILE
++ifeq ($(CROSS_COMPILE),)
+ CROSS_COMPILE=$(call qstrip,$(CROSS_COMPILER_PREFIX))
+ endif
+ 
diff --git a/meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch b/meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch
new file mode 100644
index 0000000..16e48b1
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch
@@ -0,0 +1,83 @@
+Defer removal of the local scope of a dl-opened library after
+all the destructors (of itself and related dependencies) are actually
+get unloaded, otherwise any function registered via atexit()
+won't be resolved.
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono at st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
+---
+ ldso/libdl/libdl.c |   33 +++++++++++++++++++++------------
+ 1 files changed, 21 insertions(+), 12 deletions(-)
+
+
+Upstream-Status: Pending
+
+Index: git/ldso/libdl/libdl.c
+===================================================================
+--- git.orig/ldso/libdl/libdl.c	2012-01-17 17:38:44.930821794 -0800
++++ git/ldso/libdl/libdl.c	2012-01-17 17:39:02.754822656 -0800
+@@ -780,7 +780,9 @@
+ 	struct dyn_elf *handle;
+ 	unsigned int end = 0, start = 0xffffffff;
+ 	unsigned int i, j;
+-	struct r_scope_elem *ls;
++	struct r_scope_elem *ls, *ls_next = NULL;
++	struct elf_resolve **handle_rlist;
++
+ #if defined(USE_TLS) && USE_TLS
+ 	bool any_tls = false;
+ 	size_t tls_free_start = NO_TLS_OFFSET;
+@@ -813,6 +815,19 @@
+ 		free(handle);
+ 		return 0;
+ 	}
++
++	/* Store the handle's local scope array for later removal */
++	handle_rlist = handle->dyn->symbol_scope.r_list;
++
++	/* Store references to the local scope entries for later removal */
++	for (ls = &_dl_loaded_modules->symbol_scope; ls && ls->next; ls = ls->next)
++		if (ls->next->r_list[0] == handle->dyn) {
++			break;
++		}
++	/* ls points to the previous local symbol scope */
++	if(ls && ls->next)
++		ls_next = ls->next->next;
++
+ 	/* OK, this is a valid handle - now close out the file */
+ 	for (j = 0; j < handle->init_fini.nlist; ++j) {
+ 		tpnt = handle->init_fini.init_fini[j];
+@@ -974,16 +989,6 @@
+ 				}
+ 			}
+ 
+-			if (handle->dyn == tpnt) {
+-				/* Unlink the local scope from global one */
+-				for (ls = &_dl_loaded_modules->symbol_scope; ls; ls = ls->next)
+-					if (ls->next->r_list[0] == tpnt) {
+-						_dl_if_debug_print("removing symbol_scope: %s\n", tpnt->libname);
+-						break;
+-					}
+-				ls->next = ls->next->next;
+-			}
+-
+ 			/* Next, remove tpnt from the global symbol table list */
+ 			if (_dl_symbol_tables) {
+ 				if (_dl_symbol_tables->dyn == tpnt) {
+@@ -1005,10 +1010,14 @@
+ 				}
+ 			}
+ 			free(tpnt->libname);
+-			free(tpnt->symbol_scope.r_list);
+ 			free(tpnt);
+ 		}
+ 	}
++	/* Unlink and release the handle's local scope from global one */
++	if(ls)
++		ls->next = ls_next;
++	free(handle_rlist);
++
+ 	for (rpnt1 = handle->next; rpnt1; rpnt1 = rpnt1_tmp) {
+ 		rpnt1_tmp = rpnt1->next;
+ 		free(rpnt1);
diff --git a/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch b/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
index cfa68ce..d44acca 100644
--- a/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
@@ -1,3 +1,9 @@
+resolver code should always be in arm mode
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
 Index: uClibc/ldso/ldso/arm/resolve.S
 ===================================================================
 --- uClibc.orig/ldso/ldso/arm/resolve.S	2009-03-20 12:03:32.000000000 -0700
diff --git a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch b/meta/recipes-core/uclibc/uclibc-git/orign_path.patch
deleted file mode 100644
index b22be8c..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Patch is backported from 
-http://lists.busybox.net/pipermail/uclibc/2011-March/045003.html
-
-Upstream-Status: Pending
-
-Index: git/ldso/ldso/dl-elf.c
-===================================================================
---- git.orig/ldso/ldso/dl-elf.c	2011-07-01 15:20:51.000000000 -0700
-+++ git/ldso/ldso/dl-elf.c	2011-07-01 15:21:47.493578777 -0700
-@@ -133,53 +133,60 @@
-  * in uClibc/ldso/util/ldd.c */
- static struct elf_resolve *
- search_for_named_library(const char *name, int secure, const char *path_list,
--	struct dyn_elf **rpnt)
-+	struct dyn_elf **rpnt, const char *origin)
- {
--	char *path, *path_n, *mylibname;
-+	char *mylibname;
-+	const char *p, *pn;
- 	struct elf_resolve *tpnt;
--	int done;
-+	int plen;
- 
- 	if (path_list==NULL)
- 		return NULL;
- 
--	/* We need a writable copy of this string, but we don't
--	 * need this allocated permanently since we don't want
--	 * to leak memory, so use alloca to put path on the stack */
--	done = _dl_strlen(path_list);
--	path = alloca(done + 1);
--
- 	/* another bit of local storage */
- 	mylibname = alloca(2050);
- 
--	_dl_memcpy(path, path_list, done+1);
--
- 	/* Unlike ldd.c, don't bother to eliminate double //s */
- 
- 	/* Replace colons with zeros in path_list */
- 	/* : at the beginning or end of path maps to CWD */
- 	/* :: anywhere maps CWD */
- 	/* "" maps to CWD */
--	done = 0;
--	path_n = path;
--	do {
--		if (*path == 0) {
--			*path = ':';
--			done = 1;
--		}
--		if (*path == ':') {
--			*path = 0;
--			if (*path_n)
--				_dl_strcpy(mylibname, path_n);
--			else
--				_dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
--			_dl_strcat(mylibname, "/");
--			_dl_strcat(mylibname, name);
--			if ((tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname)) != NULL)
--				return tpnt;
--			path_n = path+1;
-+	for (p = path_list; p != NULL; p = pn) {
-+		pn = _dl_strchr(p + 1, ':');
-+		if (pn != NULL) {
-+			plen = pn - p;
-+			pn++;
-+		} else
-+			plen = _dl_strlen(p);
-+
-+		if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
-+			int olen;
-+			if (secure && plen != 7)
-+				continue;
-+			if (origin == NULL)
-+				continue;
-+			for (olen = _dl_strlen(origin) - 1; olen >= 0 && origin[olen] != '/'; olen--)
-+				;
-+			if (olen <= 0)
-+				continue;
-+			_dl_memcpy(&mylibname[0], origin, olen);
-+			_dl_memcpy(&mylibname[olen], p + 7, plen - 7);
-+			mylibname[olen + plen - 7] = 0;
-+		} else if (plen != 0) {
-+			_dl_memcpy(mylibname, p, plen);
-+			mylibname[plen] = 0;
-+		} else {
-+			_dl_strcpy(mylibname, ".");
- 		}
--		path++;
--	} while (!done);
-+		_dl_strcat(mylibname, "/");
-+		_dl_strcat(mylibname, name);
-+
-+		tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname);
-+		if (tpnt != NULL)
-+			return tpnt;
-+	}
-+
- 	return NULL;
- }
- 
-@@ -231,7 +238,8 @@
- 	if (pnt) {
- 		pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- 		_dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
--		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt,
-+						      tpnt->libname)) != NULL)
- 			return tpnt1;
- 	}
- #endif
-@@ -239,7 +247,7 @@
- 	/* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
- 	if (_dl_library_path) {
- 		_dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
--		if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt, NULL)) != NULL)
- 		{
- 			return tpnt1;
- 		}
-@@ -253,7 +261,7 @@
- 	if (pnt) {
- 		pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- 		_dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
--		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, NULL)) != NULL)
- 			return tpnt1;
- 	}
- #endif
-@@ -287,7 +295,7 @@
- 	/* Look for libraries wherever the shared library loader
- 	 * was installed */
- 	_dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
--	tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt);
-+	tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt, NULL);
- 	if (tpnt1 != NULL)
- 		return tpnt1;
- 
-@@ -300,7 +308,7 @@
- #ifndef __LDSO_CACHE_SUPPORT__
- 					":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
- #endif
--					, rpnt);
-+					, rpnt, NULL);
- 	if (tpnt1 != NULL)
- 		return tpnt1;
- 
-Index: git/ldso/ldso/ldso.c
-===================================================================
---- git.orig/ldso/ldso/ldso.c	2011-07-01 15:20:51.000000000 -0700
-+++ git/ldso/ldso/ldso.c	2011-07-01 15:24:32.363820591 -0700
-@@ -370,6 +370,20 @@
- 	return p - list;
- }
- 
-+static void _dl_setup_progname(const char *argv0)
-+{
-+	char image[PATH_MAX];
-+	ssize_t s;
-+
-+	s = _dl_readlink("/proc/self/exe", image, sizeof(image));
-+	if (s > 0 && image[0] == '/') {
-+		image[s] = 0;
-+		_dl_progname = _dl_strdup(image);
-+	} else if (argv0) {
-+		_dl_progname = argv0;
-+	}
-+}
-+
- void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- 			  ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
- 			  DL_GET_READY_TO_RUN_EXTRA_PARMS)
-@@ -421,9 +435,7 @@
- 	 * been fixed up by now.  Still no function calls outside of this
- 	 * library, since the dynamic resolver is not yet ready.
- 	 */
--	if (argv[0]) {
--		_dl_progname = argv[0];
--	}
-+	_dl_setup_progname(argv[0]);
- 
- #ifndef __LDSO_STANDALONE_SUPPORT__
- 	if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) {
diff --git a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
index 339ce7f..3fa10af 100644
--- a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
@@ -1,3 +1,9 @@
+Add ppc copysignl implementation
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 Index: git/libc/sysdeps/linux/powerpc/Makefile.arch
 ===================================================================
 --- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch
diff --git a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
index 1930383..90fd3db 100644
--- a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
@@ -1,3 +1,8 @@
+Dont support localised optimizations this helps to have a global -O level
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
 Index: git/include/features.h
 ===================================================================
 --- git.orig/include/features.h
diff --git a/meta/recipes-core/uclibc/uclibc-git/rtld_no.patch b/meta/recipes-core/uclibc/uclibc-git/rtld_no.patch
deleted file mode 100644
index 36fec65..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/rtld_no.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Patch is backported from
-http://lists.busybox.net/pipermail/uclibc/2011-March/045004.html
-
-Upstream-Status: Pending
-
-Index: git/ldso/include/dl-elf.h
-===================================================================
---- git.orig/ldso/include/dl-elf.h	2011-07-01 15:20:51.000000000 -0700
-+++ git/ldso/include/dl-elf.h	2011-07-01 15:30:43.274364603 -0700
-@@ -26,16 +26,18 @@
- static __inline__ void _dl_unmap_cache(void) { }
- #endif
- 
-+#define DL_RESOLVE_SECURE		0x0001
-+#define DL_RESOLVE_NOLOAD		0x0002
- 
- /* Function prototypes for non-static stuff in readelflib1.c */
- extern void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- 	unsigned long rel_addr, unsigned long rel_size);
- extern int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- 	struct r_scope_elem *scope, unsigned long rel_addr, unsigned long rel_size);
--extern struct elf_resolve * _dl_load_shared_library(int secure,
-+extern struct elf_resolve * _dl_load_shared_library(int resolve_flags,
- 	struct dyn_elf **rpnt, struct elf_resolve *tpnt, char *full_libname,
- 	int trace_loaded_objects);
--extern struct elf_resolve * _dl_load_elf_shared_library(int secure,
-+extern struct elf_resolve * _dl_load_elf_shared_library(int resolve_flags,
- 	struct dyn_elf **rpnt, const char *libname);
- extern struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname,
- 	int trace_loaded_objects);
-Index: git/ldso/ldso/dl-elf.c
-===================================================================
---- git.orig/ldso/ldso/dl-elf.c	2011-07-01 15:21:47.000000000 -0700
-+++ git/ldso/ldso/dl-elf.c	2011-07-01 15:31:29.814432859 -0700
-@@ -132,7 +132,7 @@
- /* This function's behavior must exactly match that
-  * in uClibc/ldso/util/ldd.c */
- static struct elf_resolve *
--search_for_named_library(const char *name, int secure, const char *path_list,
-+search_for_named_library(const char *name, int resolve_flags, const char *path_list,
- 	struct dyn_elf **rpnt, const char *origin)
- {
- 	char *mylibname;
-@@ -162,7 +162,7 @@
- 
- 		if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
- 			int olen;
--			if (secure && plen != 7)
-+			if ((resolve_flags & DL_RESOLVE_SECURE) && plen != 7)
- 				continue;
- 			if (origin == NULL)
- 				continue;
-@@ -182,7 +182,7 @@
- 		_dl_strcat(mylibname, "/");
- 		_dl_strcat(mylibname, name);
- 
--		tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname);
-+		tpnt = _dl_load_elf_shared_library(resolve_flags, rpnt, mylibname);
- 		if (tpnt != NULL)
- 			return tpnt;
- 	}
-@@ -194,7 +194,7 @@
- unsigned long _dl_error_number;
- unsigned long _dl_internal_error_number;
- 
--struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
-+struct elf_resolve *_dl_load_shared_library(int resolve_flags, struct dyn_elf **rpnt,
- 	struct elf_resolve *tpnt, char *full_libname, int attribute_unused trace_loaded_objects)
- {
- 	char *pnt;
-@@ -223,7 +223,7 @@
- 
- 	if (libname != full_libname) {
- 		_dl_if_debug_dprint("\ttrying file='%s'\n", full_libname);
--		tpnt1 = _dl_load_elf_shared_library(secure, rpnt, full_libname);
-+		tpnt1 = _dl_load_elf_shared_library(resolve_flags, rpnt, full_libname);
- 		if (tpnt1) {
- 			return tpnt1;
- 		}
-@@ -238,7 +238,7 @@
- 	if (pnt) {
- 		pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- 		_dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
--		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt,
-+		if ((tpnt1 = search_for_named_library(libname, resolve_flags, pnt, rpnt,
- 						      tpnt->libname)) != NULL)
- 			return tpnt1;
- 	}
-@@ -247,7 +247,7 @@
- 	/* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
- 	if (_dl_library_path) {
- 		_dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
--		if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt, NULL)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, resolve_flags, _dl_library_path, rpnt, NULL)) != NULL)
- 		{
- 			return tpnt1;
- 		}
-@@ -261,7 +261,7 @@
- 	if (pnt) {
- 		pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- 		_dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
--		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, NULL)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, resolve_flags, pnt, rpnt, NULL)) != NULL)
- 			return tpnt1;
- 	}
- #endif
-@@ -284,7 +284,7 @@
- 			     || libent[i].flags == LIB_ELF_LIBC0
- 			     ||	libent[i].flags == LIB_ELF_LIBC5)
- 			 && _dl_strcmp(libname, strs + libent[i].sooffset) == 0
--			 && (tpnt1 = _dl_load_elf_shared_library(secure, rpnt, strs + libent[i].liboffset))
-+			 && (tpnt1 = _dl_load_elf_shared_library(resolve_flags, rpnt, strs + libent[i].liboffset))
- 			) {
- 				return tpnt1;
- 			}
-@@ -295,14 +295,14 @@
- 	/* Look for libraries wherever the shared library loader
- 	 * was installed */
- 	_dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
--	tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt, NULL);
-+	tpnt1 = search_for_named_library(libname, resolve_flags, _dl_ldsopath, rpnt, NULL);
- 	if (tpnt1 != NULL)
- 		return tpnt1;
- 
- 	/* Lastly, search the standard list of paths for the library.
- 	   This list must exactly match the list in uClibc/ldso/util/ldd.c */
- 	_dl_if_debug_dprint("\tsearching full lib path list\n");
--	tpnt1 = search_for_named_library(libname, secure,
-+	tpnt1 = search_for_named_library(libname, resolve_flags,
- 					UCLIBC_RUNTIME_PREFIX "lib:"
- 					UCLIBC_RUNTIME_PREFIX "usr/lib"
- #ifndef __LDSO_CACHE_SUPPORT__
-@@ -444,7 +444,7 @@
-  * are required.
-  */
- 
--struct elf_resolve *_dl_load_elf_shared_library(int secure,
-+struct elf_resolve *_dl_load_elf_shared_library(int resolve_flags,
- 	struct dyn_elf **rpnt, const char *libname)
- {
- 	ElfW(Ehdr) *epnt;
-@@ -483,7 +483,7 @@
- 	}
- 	/* If we are in secure mode (i.e. a setu/gid binary using LD_PRELOAD),
- 	   we don't load the library if it isn't setuid. */
--	if (secure) {
-+	if (resolve_flags & DL_RESOLVE_SECURE) {
- 		if (!(st.st_mode & S_ISUID)) {
- 			_dl_close(infile);
- 			return NULL;
-@@ -499,6 +499,10 @@
- 			return tpnt;
- 		}
- 	}
-+	if (resolve_flags & DL_RESOLVE_NOLOAD) {
-+		_dl_close(infile);
-+		return NULL;
-+	}
- 	header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE,
- 			MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0);
- 	if (_dl_mmap_check_error(header)) {
-Index: git/ldso/ldso/ldso.c
-===================================================================
---- git.orig/ldso/ldso/ldso.c	2011-07-01 15:24:32.000000000 -0700
-+++ git/ldso/ldso/ldso.c	2011-07-01 15:24:55.143854007 -0700
-@@ -854,7 +854,9 @@
- 			if (!_dl_secure || _dl_strchr(str, '/') == NULL) {
- 				_dl_if_debug_dprint("\tfile='%s';  needed by '%s'\n", str, _dl_progname);
- 
--				tpnt1 = _dl_load_shared_library(_dl_secure, &rpnt, NULL, str, trace_loaded_objects);
-+				tpnt1 = _dl_load_shared_library(
-+					_dl_secure ? DL_RESOLVE_SECURE : 0,
-+					&rpnt, NULL, str, trace_loaded_objects);
- 				if (!tpnt1) {
- #ifdef __LDSO_LDD_SUPPORT__
- 					if (trace_loaded_objects || _dl_trace_prelink)
-Index: git/ldso/libdl/libdl.c
-===================================================================
---- git.orig/ldso/libdl/libdl.c	2011-07-01 15:20:51.000000000 -0700
-+++ git/ldso/libdl/libdl.c	2011-07-01 15:24:55.143854007 -0700
-@@ -305,7 +305,7 @@
- #endif
- 
- 	/* A bit of sanity checking... */
--	if (!(flag & (RTLD_LAZY|RTLD_NOW))) {
-+	if (!(flag & (RTLD_LAZY|RTLD_NOW|RTLD_NOLOAD))) {
- 		_dl_error_number = LD_BAD_HANDLE;
- 		return NULL;
- 	}
-@@ -375,8 +375,9 @@
- 	/* Try to load the specified library */
- 	_dl_if_debug_print("Trying to dlopen '%s', RTLD_GLOBAL:%d RTLD_NOW:%d\n",
- 			(char*)libname, (flag & RTLD_GLOBAL ? 1:0), (now_flag & RTLD_NOW ? 1:0));
--	tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname, 0);
- 
-+	tpnt = _dl_load_shared_library((flag & RTLD_NOLOAD) ? DL_RESOLVE_NOLOAD : 0,
-+					&rpnt, tfrom, (char*)libname, 0);
- 	if (tpnt == NULL) {
- 		_dl_unmap_cache();
- 		return NULL;
-Index: git/libc/sysdeps/linux/common/bits/dlfcn.h
-===================================================================
---- git.orig/libc/sysdeps/linux/common/bits/dlfcn.h	2011-07-01 15:20:52.000000000 -0700
-+++ git/libc/sysdeps/linux/common/bits/dlfcn.h	2011-07-01 15:24:55.143854007 -0700
-@@ -24,9 +24,9 @@
- /* The MODE argument to `dlopen' contains one of the following: */
- #define RTLD_LAZY	0x00001	/* Lazy function call binding.  */
- #define RTLD_NOW	0x00002	/* Immediate function call binding.  */
--#if 0 /* uClibc doesnt support these */
--#define	RTLD_BINDING_MASK   0x3	/* Mask of binding time value.  */
-+#define RTLD_BINDING_MASK   0x3	/* Mask of binding time value.  */
- #define RTLD_NOLOAD	0x00004	/* Do not load the object.  */
-+#if 0 /* uClibc doesnt support these */
- #define RTLD_DEEPBIND	0x00008	/* Use deep binding.  */
- #endif
- 
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index 9b2a0e5..3948d1a 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
@@ -181,3 +181,5 @@ UCLIBC_HAS_FLOATS=y
 
 # needed by systemd
 UCLIBC_HAS_UTMPX=y
+UCLIBC_LINUX_MODULE_26=y
+UCLIBC_HAS_RESOLVER_SUPPORT=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch b/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch
index 504d37b..05a394d 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch
@@ -1,3 +1,8 @@
+ftruncate64 has 4 args on arm
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
 Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
 ===================================================================
 --- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
diff --git a/meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch b/meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch
index cd90a09..fe191fc 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch
@@ -12,6 +12,9 @@ Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
  3 files changed, 46 insertions(+), 5 deletions(-)
  create mode 100644 libc/unistd/execvpe.c
 
+
+Upstream-Status: Pending
+
 diff --git a/include/unistd.h b/include/unistd.h
 index 9568790..070e4f2 100644
 --- a/include/unistd.h
diff --git a/meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch b/meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch
index f8f3a7d..37a5988 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch
@@ -1,3 +1,8 @@
+uclibc now has log2 so enable the tests
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
 Index: uClibc/test/math/libm-test.inc
 ===================================================================
 --- uClibc/test/math/libm-test.inc	(revision 23784)
diff --git a/meta/recipes-core/uclibc/uclibc-git/uclibc_scheduler_update.patch b/meta/recipes-core/uclibc/uclibc-git/uclibc_scheduler_update.patch
deleted file mode 100644
index 78401bd..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/uclibc_scheduler_update.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-From 2becc16ecbef71c496644d9dc6cbd7383d7cdca3 Mon Sep 17 00:00:00 2001
-From: Henning Heinold <heinold@inf.fu-berlin.de>
-Date: Sat, 4 Jun 2011 21:21:41 +0200
-Subject: [PATCH 1/2] libc: updates the linux scheduler functions, most stuff
- was taken from the eglibc
-
-
-Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
----
- include/sched.h                            |   52 ++++++++++++----
- libc/sysdeps/linux/common/Makefile.in      |    4 +-
- libc/sysdeps/linux/common/bits/sched.h     |   96 +++++++++++++++++++++++-----
- libc/sysdeps/linux/common/sched_cpualloc.c |   27 ++++++++
- libc/sysdeps/linux/common/sched_cpucount.c |   60 +++++++++++++++++
- libc/sysdeps/linux/common/sched_cpufree.c  |   27 ++++++++
- libc/sysdeps/linux/common/sched_getcpu.c   |   37 +++++++++++
- libc/sysdeps/linux/common/unshare.c        |   12 ++++
- 8 files changed, 286 insertions(+), 29 deletions(-)
- create mode 100644 libc/sysdeps/linux/common/sched_cpualloc.c
- create mode 100644 libc/sysdeps/linux/common/sched_cpucount.c
- create mode 100644 libc/sysdeps/linux/common/sched_cpufree.c
- create mode 100644 libc/sysdeps/linux/common/sched_getcpu.c
- create mode 100644 libc/sysdeps/linux/common/unshare.c
-
-diff --git a/include/sched.h b/include/sched.h
-index 0d110c3..e265b84 100644
---- a/include/sched.h
-+++ b/include/sched.h
-@@ -1,5 +1,5 @@
- /* Definitions for POSIX 1003.1b-1993 (aka POSIX.4) scheduling interface.
--   Copyright (C) 1996,1997,1999,2001-2003,2004 Free Software Foundation, Inc.
-+   Copyright (C) 1996,1997,1999,2001-2004,2007 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -25,6 +25,9 @@
- /* Get type definitions.  */
- #include <bits/types.h>
- 
-+#define __need_size_t
-+#include <stddef.h>
-+
- #define __need_timespec
- #include <time.h>
- 
-@@ -65,11 +68,42 @@ extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
- 
- #if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
- /* Access macros for `cpu_set'.  */
--#define CPU_SETSIZE __CPU_SETSIZE
--#define CPU_SET(cpu, cpusetp)	__CPU_SET (cpu, cpusetp)
--#define CPU_CLR(cpu, cpusetp)	__CPU_CLR (cpu, cpusetp)
--#define CPU_ISSET(cpu, cpusetp)	__CPU_ISSET (cpu, cpusetp)
--#define CPU_ZERO(cpusetp)	__CPU_ZERO (cpusetp)
-+# define CPU_SETSIZE __CPU_SETSIZE
-+# define CPU_SET(cpu, cpusetp)	 __CPU_SET_S (cpu, sizeof (cpu_set_t), cpusetp)
-+# define CPU_CLR(cpu, cpusetp)	 __CPU_CLR_S (cpu, sizeof (cpu_set_t), cpusetp)
-+# define CPU_ISSET(cpu, cpusetp) __CPU_ISSET_S (cpu, sizeof (cpu_set_t), \
-+						cpusetp)
-+# define CPU_ZERO(cpusetp)	 __CPU_ZERO_S (sizeof (cpu_set_t), cpusetp)
-+# define CPU_COUNT(cpusetp)	 __CPU_COUNT_S (sizeof (cpu_set_t), cpusetp)
-+
-+# define CPU_SET_S(cpu, setsize, cpusetp)   __CPU_SET_S (cpu, setsize, cpusetp)
-+# define CPU_CLR_S(cpu, setsize, cpusetp)   __CPU_CLR_S (cpu, setsize, cpusetp)
-+# define CPU_ISSET_S(cpu, setsize, cpusetp) __CPU_ISSET_S (cpu, setsize, \
-+							   cpusetp)
-+# define CPU_ZERO_S(setsize, cpusetp)	    __CPU_ZERO_S (setsize, cpusetp)
-+# define CPU_COUNT_S(setsize, cpusetp)	    __CPU_COUNT_S (setsize, cpusetp)
-+
-+# define CPU_EQUAL(cpusetp1, cpusetp2) \
-+  __CPU_EQUAL_S (sizeof (cpu_set_t), cpusetp1, cpusetp2)
-+# define CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-+  __CPU_EQUAL_S (setsize, cpusetp1, cpusetp2)
-+
-+# define CPU_AND(destset, srcset1, srcset2) \
-+  __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, &)
-+# define CPU_OR(destset, srcset1, srcset2) \
-+  __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, |)
-+# define CPU_XOR(destset, srcset1, srcset2) \
-+  __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, ^)
-+# define CPU_AND_S(setsize, destset, srcset1, srcset2) \
-+  __CPU_OP_S (setsize, destset, srcset1, srcset2, &)
-+# define CPU_OR_S(setsize, destset, srcset1, srcset2) \
-+  __CPU_OP_S (setsize, destset, srcset1, srcset2, |)
-+# define CPU_XOR_S(setsize, destset, srcset1, srcset2) \
-+  __CPU_OP_S (setsize, destset, srcset1, srcset2, ^)
-+
-+# define CPU_ALLOC_SIZE(count) __CPU_ALLOC_SIZE (count)
-+# define CPU_ALLOC(count) __CPU_ALLOC (count)
-+# define CPU_FREE(cpuset) __CPU_FREE (cpuset)
- 
- 
- /* Set the CPU affinity for a task */
-@@ -79,12 +113,6 @@ extern int sched_setaffinity (__pid_t __pid, size_t __cpusetsize,
- /* Get the CPU affinity for a task */
- extern int sched_getaffinity (__pid_t __pid, size_t __cpusetsize,
- 			      cpu_set_t *__cpuset) __THROW;
--
--extern int __clone (int (*__fn) (void *__arg), void *__child_stack,
--		    int __flags, void *__arg, ...);
--extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
--		     size_t __child_stack_size, int __flags, void *__arg, ...);
--
- #endif
- 
- __END_DECLS
-diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
-index 8f936ff..cb8c153 100644
---- a/libc/sysdeps/linux/common/Makefile.in
-+++ b/libc/sysdeps/linux/common/Makefile.in
-@@ -22,9 +22,11 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += capget.c capset.c inotify.c ioperm.c iopl.c \
- 	modify_ldt.c pipe2.c personality.c ppoll.c prctl.c \
- 	readahead.c reboot.c \
- 	remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
-+	sched_cpualloc.c sched_cpucount.c sched_cpufree.c \
- 	sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
- 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
--	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c
-+	sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c \
-+	uselib.c vhangup.c
- # NPTL needs these internally: madvise.c
- CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c
- ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-diff --git a/libc/sysdeps/linux/common/bits/sched.h b/libc/sysdeps/linux/common/bits/sched.h
-index b48a0c8..fea66a8 100644
---- a/libc/sysdeps/linux/common/bits/sched.h
-+++ b/libc/sysdeps/linux/common/bits/sched.h
-@@ -1,6 +1,7 @@
- /* Definitions of constants and data structure for POSIX 1003.1b-1993
-    scheduling interface.
--   Copyright (C) 1996-1999,2001-2003,2005,2006 Free Software Foundation, Inc.
-+   Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -58,7 +59,13 @@
- 				      force CLONE_PTRACE on this clone.  */
- # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
- 					  the child.  */
--# define CLONE_STOPPED	0x02000000 /* Start in stopped state.  */
-+# define CLONE_STOPPED 0x02000000 /* Start in stopped state.  */
-+# define CLONE_NEWUTS	0x04000000	/* New utsname group.  */
-+# define CLONE_NEWIPC	0x08000000	/* New ipcs.  */
-+# define CLONE_NEWUSER	0x10000000	/* New user namespace.  */
-+# define CLONE_NEWPID	0x20000000	/* New pid namespace.  */
-+# define CLONE_NEWNET	0x40000000	/* New network namespace.  */
-+# define CLONE_IO	0x80000000	/* Clone I/O context.  */
- #endif
- 
- /* The official definition.  */
-@@ -74,10 +81,11 @@ __BEGIN_DECLS
- extern int clone (int (*__fn) (void *__arg), void *__child_stack,
- 		  int __flags, void *__arg, ...) __THROW;
- 
--#if 0
- /* Unshare the specified resources.  */
- extern int unshare (int __flags) __THROW;
--#endif
-+
-+/* Get index of currently used CPU.  */
-+extern int sched_getcpu (void) __THROW;
- #endif
- 
- __END_DECLS
-@@ -102,7 +110,7 @@ struct __sched_param
- # define __CPU_SETSIZE	1024
- # define __NCPUBITS	(8 * sizeof (__cpu_mask))
- 
--/* Type for array elements in 'cpu_set'.  */
-+/* Type for array elements in 'cpu_set_t'.  */
- typedef unsigned long int __cpu_mask;
- 
- /* Basic access functions.  */
-@@ -116,17 +124,73 @@ typedef struct
- } cpu_set_t;
- 
- /* Access functions for CPU masks.  */
--# define __CPU_ZERO(cpusetp) \
-+# define __CPU_ZERO_S(setsize, cpusetp) \
-   do {									      \
--    unsigned int __i;							      \
--    cpu_set_t *__arr = (cpusetp);					      \
--    for (__i = 0; __i < sizeof (cpu_set_t) / sizeof (__cpu_mask); ++__i)      \
--      __arr->__bits[__i] = 0;						      \
-+    size_t __i;								      \
-+    size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-+    __cpu_mask *__bits = (cpusetp)->__bits;				      \
-+    for (__i = 0; __i < __imax; ++__i)					      \
-+      __bits[__i] = 0;							      \
-   } while (0)
--# define __CPU_SET(cpu, cpusetp) \
--  ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu))
--# define __CPU_CLR(cpu, cpusetp) \
--  ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu))
--# define __CPU_ISSET(cpu, cpusetp) \
--  (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0)
-+# define __CPU_SET_S(cpu, setsize, cpusetp) \
-+  (__extension__							      \
-+   ({ size_t __cpu = (cpu);						      \
-+      __cpu < 8 * (setsize)						      \
-+      ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
-+	 |= __CPUMASK (__cpu))						      \
-+      : 0; }))
-+# define __CPU_CLR_S(cpu, setsize, cpusetp) \
-+  (__extension__							      \
-+   ({ size_t __cpu = (cpu);						      \
-+      __cpu < 8 * (setsize)						      \
-+      ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
-+	 &= ~__CPUMASK (__cpu))						      \
-+      : 0; }))
-+# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
-+  (__extension__							      \
-+   ({ size_t __cpu = (cpu);						      \
-+      __cpu < 8 * (setsize)						      \
-+      ? ((((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]	      \
-+	  & __CPUMASK (__cpu))) != 0					      \
-+      : 0; }))
-+
-+# define __CPU_COUNT_S(setsize, cpusetp) \
-+  __sched_cpucount (setsize, cpusetp)
-+
-+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-+  (__extension__							      \
-+   ({ __cpu_mask *__arr1 = (cpusetp1)->__bits;				      \
-+      __cpu_mask *__arr2 = (cpusetp2)->__bits;				      \
-+      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-+      size_t __i;							      \
-+      for (__i = 0; __i < __imax; ++__i)				      \
-+	if (__arr1[__i] != __arr2[__i])					      \
-+	  break;							      \
-+      __i == __imax; }))
-+
-+# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
-+  (__extension__							      \
-+   ({ cpu_set_t *__dest = (destset);					      \
-+      __cpu_mask *__arr1 = (srcset1)->__bits;				      \
-+      __cpu_mask *__arr2 = (srcset2)->__bits;				      \
-+      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-+      size_t __i;							      \
-+      for (__i = 0; __i < __imax; ++__i)				      \
-+	((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i];    \
-+      __dest; }))
-+
-+# define __CPU_ALLOC_SIZE(count) \
-+  ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
-+# define __CPU_ALLOC(count) __sched_cpualloc (count)
-+# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
-+
-+__BEGIN_DECLS
-+
-+extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp)
-+  __THROW;
-+extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur;
-+extern void __sched_cpufree (cpu_set_t *__set) __THROW;
-+
-+__END_DECLS
-+
- #endif
-diff --git a/libc/sysdeps/linux/common/sched_cpualloc.c b/libc/sysdeps/linux/common/sched_cpualloc.c
-new file mode 100644
-index 0000000..2642a80
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_cpualloc.c
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <sched.h>
-+#include <stdlib.h>
-+
-+
-+cpu_set_t *
-+__sched_cpualloc (size_t count)
-+{
-+  return malloc (CPU_ALLOC_SIZE (count));
-+}
-diff --git a/libc/sysdeps/linux/common/sched_cpucount.c b/libc/sysdeps/linux/common/sched_cpucount.c
-new file mode 100644
-index 0000000..331c0b8
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_cpucount.c
-@@ -0,0 +1,60 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <limits.h>
-+#include <sched.h>
-+
-+
-+int
-+__sched_cpucount (size_t setsize, const cpu_set_t *setp)
-+{
-+  int s = 0;
-+  const __cpu_mask *p = setp->__bits;
-+  const __cpu_mask *end = &setp->__bits[setsize / sizeof (__cpu_mask)];
-+
-+  while (p < end)
-+    {
-+      __cpu_mask l = *p++;
-+
-+#ifdef POPCNT
-+      s += POPCNT (l);
-+#else
-+      if (l == 0)
-+	continue;
-+
-+# if LONG_BIT > 32
-+      l = (l & 0x5555555555555555ul) + ((l >> 1) & 0x5555555555555555ul);
-+      l = (l & 0x3333333333333333ul) + ((l >> 2) & 0x3333333333333333ul);
-+      l = (l & 0x0f0f0f0f0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0f0f0f0f0ful);
-+      l = (l & 0x00ff00ff00ff00fful) + ((l >> 8) & 0x00ff00ff00ff00fful);
-+      l = (l & 0x0000ffff0000fffful) + ((l >> 16) & 0x0000ffff0000fffful);
-+      l = (l & 0x00000000fffffffful) + ((l >> 32) & 0x00000000fffffffful);
-+# else
-+      l = (l & 0x55555555ul) + ((l >> 1) & 0x55555555ul);
-+      l = (l & 0x33333333ul) + ((l >> 2) & 0x33333333ul);
-+      l = (l & 0x0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0ful);
-+      l = (l & 0x00ff00fful) + ((l >> 8) & 0x00ff00fful);
-+      l = (l & 0x0000fffful) + ((l >> 16) & 0x0000fffful);
-+# endif
-+
-+      s += l;
-+#endif
-+    }
-+
-+  return s;
-+}
-diff --git a/libc/sysdeps/linux/common/sched_cpufree.c b/libc/sysdeps/linux/common/sched_cpufree.c
-new file mode 100644
-index 0000000..dd4c613
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_cpufree.c
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <sched.h>
-+#include <stdlib.h>
-+
-+
-+void
-+__sched_cpufree (cpu_set_t *set)
-+{
-+  free (set);
-+}
-diff --git a/libc/sysdeps/linux/common/sched_getcpu.c b/libc/sysdeps/linux/common/sched_getcpu.c
-new file mode 100644
-index 0000000..b193d65
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_getcpu.c
-@@ -0,0 +1,37 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <sched.h>
-+#include <sysdep.h>
-+
-+
-+int
-+sched_getcpu (void)
-+{
-+#ifdef __NR_getcpu
-+  unsigned int cpu;
-+  int r = INLINE_SYSCALL (getcpu, 3, &cpu, NULL, NULL);
-+
-+  return r == -1 ? r : cpu;
-+#else
-+  __set_errno (ENOSYS);
-+  return -1;
-+#endif
-+}
-diff --git a/libc/sysdeps/linux/common/unshare.c b/libc/sysdeps/linux/common/unshare.c
-new file mode 100644
-index 0000000..485bf88
---- /dev/null
-+++ b/libc/sysdeps/linux/common/unshare.c
-@@ -0,0 +1,12 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * unshare() for uClibc
-+ *
-+ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <sched.h>
-+_syscall1(int, unshare, int, flags)
--- 
-1.7.5.3
-
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 92157bd..0779221 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -8,7 +8,7 @@ features, at the cost of ABI differences for different configurations. \
 uClibc has been designed from the ground up to be a C library for \
 embedded Linux.  It is NOT compatible with binaries linked against glibc."
 
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.1+"
 SECTION = "libs"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 		    file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index 8681233..ee1b5e0 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -1,4 +1,4 @@
-SRCREV="f87898ca4a7d4b7171779c06ff1f4848efeee431"
+SRCREV="a4421e60526d3420a9c0bd55bfa4a25a746cbc8e"
 
 require uclibc.inc
 
@@ -11,7 +11,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
 
-SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
+SRC_URI = "git://busybox.osuosl.org/uClibc.git;branch=master;protocol=git \
 	file://uClibc.machine \
 	file://uClibc.distro \
 	file://uclibc-arm-ftruncate64.patch \
@@ -22,9 +22,9 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
 	file://argp-headers.patch \
 	file://remove_attribute_optimize_Os.patch \
 	file://compile-arm-fork-with-O2.patch \
-	file://orign_path.patch \
-	file://rtld_no.patch \
 	file://uclibc-execvpe.patch \
-	file://uclibc_scheduler_update.patch \
+	file://fix_libdl.patch \
+	file://cross_compile_check.patch \
 	"
+
 S = "${WORKDIR}/git"
-- 
1.7.6.5

[CONSOLIDATED PULL 23/33] adt-installer: install autoconf(/automake)-nativesdk

[Saul Wold]

From: Lianhao Lu <lianhao.lu@intel.com>

[YOCTO #1909]
Install autoconf-nativesdk and automake-nativesdk to host.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 .../adt-installer/scripts/adt_installer_internal   |   18 ++++++------------
 .../installer/adt-installer_1.0.bb                 |    2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 870931e..6201095 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -91,18 +91,12 @@ check_result
 OPKG_INSTALL_CMD="$OPKG_CMD "
 OPKG_INSTALL_NATIVE_CMD="$OPKG_INSTALL_CMD  -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR install"
 
-echo_info "Installing pseudo nativesdk ...\n"
-$OPKG_INSTALL_NATIVE_CMD pseudo-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
-check_result
-echo_info "Installing opkg nativesdk ...\n"
-$OPKG_INSTALL_NATIVE_CMD opkg-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
-check_result
-echo_info "Installing pkgconfig nativesdk ...\n"
-$OPKG_INSTALL_NATIVE_CMD pkgconfig-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
-check_result
-echo_info "Installing libtool nativesdk ...\n"
-$OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
-check_result
+BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake"
+for pkg in $BASE_HOSTSDK_PKGNAMES; do
+  echo_info "Installing ${pkg} nativesdk ...\n"
+  $OPKG_INSTALL_NATIVE_CMD ${pkg}-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
+  check_result
+done
 
 for native_target_type in $YOCTOADT_TARGETS; do
   native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/'  -e 's/x86$/i586/'`
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 53911b8..39e53c1 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
 
 PACKAGES = ""
 
-PR = "r4"
+PR = "r5"
 
 ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
 ADT_DIR = "${WORKDIR}/adt-installer/"
-- 
1.7.6.5

[CONSOLIDATED PULL 24/33] e2fsprogs_1.42.bb: Fix build fallout for uclibc

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

e2fsprogs 1.42 onwards uses fallocate() which uclibc
does not implement(yet). In most of places its use
is controlled and it only used when configure detects
fallocate being present but in this one case it missed
to check for fallocate being available so here we
add the check

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../e2fsprogs/e2fsprogs-1.42/fallocate.patch       |   22 ++++++++++++++++++++
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb  |    3 +-
 2 files changed, 24 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch
new file mode 100644
index 0000000..4d952a5
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch
@@ -0,0 +1,22 @@
+We assume that fallocate is supported somehow
+but we need to check if we have fallocate()
+this problem shows up on uclibc systems since
+uclibc does not have fallocate() implemented
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
+===================================================================
+--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c	2012-01-17 17:24:34.290780625 -0800
++++ e2fsprogs-1.42/lib/ext2fs/unix_io.c	2012-01-17 17:25:37.338783680 -0800
+@@ -895,7 +895,7 @@
+ 		goto unimplemented;
+ #endif
+ 	} else {
+-#ifdef FALLOC_FL_PUNCH_HOLE
++#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE
+ 		/*
+ 		 * If we are not on block device, try to use punch hole
+ 		 * to reclaim free space.
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index 9ff85a2..f6759aa7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,8 +1,9 @@
 require e2fsprogs.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://quotefix.patch \
+            file://fallocate.patch \
             file://acinclude.m4"
 
 SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
-- 
1.7.6.5

[CONSOLIDATED PULL 25/33] xinput: add utility for configuring and testing XInput devices.

[Saul Wold]

From: Andrea Adami <andrea.adami@gmail.com>

* from meta-openembedded with minor editings
* (fields reordering like other recipes in xorg-app)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb

diff --git a/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb b/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb
new file mode 100644
index 0000000..8f17e9a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+
+SUMMARY = "Runtime configuration and test of XInput devices"
+
+DESCRIPTION = "Xinput is an utility for configuring and testing XInput devices"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
+
+DEPENDS += " libxi"
+
+PR = "r7"
+
+SRC_URI[md5sum] = "1e2f0ad4f3fa833b65c568907f171d28"
+SRC_URI[sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76"
-- 
1.7.6.5

[CONSOLIDATED PULL 26/33] distro-tracking-fields: claim responsibility for udev, dpkg, apt, v86d

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

Nominate myself to be on the hook for updates to the udev, dpkg, apt and v86d
recipes.

Add a copy of the clutter-1.8 metadata without the namespace to keep the
tools happy when they find the clutter_git recipe.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   38 +++++++++++--------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index a4aacfb..0aed343 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -778,13 +778,13 @@ DISTRO_PN_ALIAS_pn-opkg_nogpg = "OSPDT upstream=http://svn.openmoko.org/trunk/s
 
 
 RECIPE_STATUS_pn-dpkg = "green"
-RECIPE_LATEST_VERSION_pn-dpkg = "1.16.0.3"
+RECIPE_LATEST_VERSION_pn-dpkg = "1.16.1.2"
 RECIPE_INTEL_SECTION_pn-dpkg = "base utils"
-RECIPE_LATEST_RELEASE_DATE_pn-dpkg = "May 04, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-dpkg = "Nov 25, 2011"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dpkg = "1 months"
 RECIPE_LAST_UPDATE_pn-dpkg = "Dec 30, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-dpkg = "Jun 29, 2011"
-RECIPE_MAINTAINER_pn-dpkg = "Dongxiao Xu <dongxiao.xu@intel.com"
+RECIPE_MANUAL_CHECK_DATE_pn-dpkg = "Jan 18, 2012"
+RECIPE_MAINTAINER_pn-dpkg = "Joshua Lock <josh@linux.intel.com"
 
 RECIPE_STATUS_pn-opkg-utils = "green"
 RECIPE_DEPENDENCY_CHECK_pn-opkg-utils = "not done"
@@ -1201,8 +1201,8 @@ RECIPE_STATUS_pn-apt = "red"
 RECIPE_LATEST_VERSION_pn-apt = "0.8.15.9"
 RECIPE_LATEST_RELEASE_DATE_pn-apt = "Oct 14, 2011"
 RECIPE_LAST_UPDATE_pn-apt = "Oct 6, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-apt = "Nov 08, 2011"
-RECIPE_NO_UPDATE_REASON_pn-apt="similar to zypper, defer the upgrading"
+RECIPE_MANUAL_CHECK_DATE_pn-apt = "Jan 18, 2012"
+RECIPE_MAINTAINER_pn-apt = "Joshua Lock <josh@linux.intel.com>"
 
 RECIPE_STATUS_pn-chrpath = "red"
 RECIPE_DEPENDENCY_CHECK_pn-chrpath = "not done"
@@ -1451,7 +1451,7 @@ RECIPE_COMMENTS_pn-update-modules = ""
 
 RECIPE_STATUS_pn-udev-extraconf = "green"
 RECIPE_LAST_UPDATE_pn-udev-extraconf = "Jul 19, 2008"
-RECIPE_MAINTAINER_pn-udev-extraconf = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_MAINTAINER_pn-udev-extraconf = "Joshua Lock <josh@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-udev-extraconf = "not done"
 RECIPE_LATEST_VERSION_pn-udev-extraconf = "0.0"
 RECIPE_PATCH_pn-udev-extraconf+mount.blacklist = "add mount blacklist"
@@ -1735,26 +1735,25 @@ RECIPE_INTEL_SECTION_pn-dhcp = "base utils"
 RECIPE_COMMENTS_pn-dhcp = "several major release, others are 3.1.3, 4.0.2-P1, need to identify"
 
 RECIPE_STATUS_pn-v86d = "yellow"   # self written configure
-RECIPE_LAST_UPDATE_pn-udev = "Jul 6, 2010"
-RECIPE_MAINTAINER_pn-v86d = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_LAST_UPDATE_pn-v86d = "Oct 11, 2011"
+RECIPE_MAINTAINER_pn-v86d = "Joshua Lock <josh@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-v86d = "not done"
-RECIPE_LATEST_VERSION_pn-v86d = "0.1.9"
+RECIPE_LATEST_VERSION_pn-v86d = "0.1.10"
 RECIPE_PATCH_pn-v86d+fbsetup = "init script"
 RECIPE_INTEL_SECTION_pn-v86d = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-v86d = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-v86d = "Oct 01, 2008"
+RECIPE_LATEST_RELEASE_DATE_pn-v86d = "Feb 25, 2011"
 RECIPE_COMMENTS_pn-v86d = "contains code under other licenses"
 DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d"
 
 RECIPE_STATUS_pn-udev = "yellow"   # needs to delete old versions
 RECIPE_LAST_UPDATE_pn-udev = "Dec 7, 2010"
-RECIPE_MAINTAINER_pn-udev = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_MAINTAINER_pn-udev = "Joshua Lock <josh@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-udev = "not done"
-RECIPE_LATEST_VERSION_pn-udev = "158"
+RECIPE_LATEST_VERSION_pn-udev = "164"
 RECIPE_INTEL_SECTION_pn-udev = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-udev = "<1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-udev = "Jun 01, 2010"
-RECIPE_COMMENTS_pn-udev = "may need different versions for different kernels"
+RECIPE_LATEST_RELEASE_DATE_pn-udev = "Jan 11, 2012"
+RECIPE_COMMENTS_pn-udev = "udev updates will require extra testing in the transition to kmod, etc"
 
 RECIPE_STATUS_pn-tzdata = "green"
 RECIPE_LATEST_VERSION_pn-tzdata = "2011n"
@@ -5525,6 +5524,13 @@ RECIPE_LATEST_VERSION_pn-clutter-1.8 = "1.8.2"
 RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = "Dec 13, 2011"
 RECIPE_LAST_UPDATE_pn-clutter-1.8 = "Dec 13, 2011"
 RECIPE_MAINTAINER_pn-clutter-1.8 = "Joshua Lock <josh@linux.intel.com>"
+# Non namespaced version for git recipe
+RECIPE_STATUS_pn-clutter = "green"
+DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter"
+RECIPE_LATEST_VERSION_pn-clutter = "1.8.2"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter = "Dec 13, 2011"
+RECIPE_LAST_UPDATE_pn-clutter = "Dec 13, 2011"
+RECIPE_MAINTAINER_pn-clutter = "Joshua Lock <josh@linux.intel.com>"
 
 RECIPE_STATUS_pn-clutter-gtk-1.8 = "red"
 DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
-- 
1.7.6.5

[CONSOLIDATED PULL 27/33] bdwgc: new recipe for autogen

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This recipe is needed by guile.
And guile is needed for autogen.

As per Beth's recommondation changed the license specification of the
recipe as

LICENSE = "MIT & FSF-Unlimited & GPL-2.0"

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-support/bdwgc/bdwgc_20110107.bb |   37 ++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-support/bdwgc/bdwgc_20110107.bb

diff --git a/meta/recipes-support/bdwgc/bdwgc_20110107.bb b/meta/recipes-support/bdwgc/bdwgc_20110107.bb
new file mode 100644
index 0000000..327e59b
--- /dev/null
+++ b/meta/recipes-support/bdwgc/bdwgc_20110107.bb
@@ -0,0 +1,37 @@
+SUMMARY = "A garbage collector for C and C++"
+
+DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\
+ used as a garbage collecting replacement for C malloc or C++ new. It allows\
+ you to allocate memory basically as you normally would, without explicitly\
+ deallocating memory that is no longer useful. The collector automatically\
+ recycles memory when it determines that it can no longer be otherwise\
+ accessed.\
+  The collector is also used by a number of programming language\
+ implementations that either use C as intermediate code, want to facilitate\
+ easier interoperation with C libraries, or just prefer the simple collector\
+ interface.\
+  Alternatively, the garbage collector may be used as a leak detector for C\
+ or C++ programs, though that is not its primary goal.\
+  Empirically, this collector works with most unmodified C programs, simply\
+ by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\
+ calls, and removing free calls."
+
+HOMEPAGE = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
+SECTION = "devel"
+LICENSE = "MIT & FSF-Unlimited & GPL-2.0"
+LIC_FILES_CHKSUM = "file://README.QUICK;md5=9b9dd874f6940641b6ab19893ee8f1cc \
+                    file://doc/README;md5=6d74ce18ff55d936a4d6bd35a98e9eb9 \
+                    file://libatomic_ops/doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab"
+
+SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/bdwgc-7_2alpha5-20110107.tar.bz2"
+
+SRC_URI[md5sum] = "4f3c130fc71ff23584edaa19a37739ee"
+SRC_URI[sha256sum] = "1f57b959ae1144e1e5fa59d52d7cb4ed626fd74cf47da1c9c119b8b46ae2722d"
+FILES_${PN}-doc = "/usr/share"
+
+PR = "r1"
+
+S = "${WORKDIR}/bdwgc"
+
+inherit autotools
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.6.5

[CONSOLIDATED PULL 28/33] libunistring: new recipe for autogen

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

libunistring recipe is needed by guile.
And guile is needed by autogen.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../libunistring/libunistring_0.9.3.bb             |   28 ++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-support/libunistring/libunistring_0.9.3.bb

diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb b/meta/recipes-support/libunistring/libunistring_0.9.3.bb
new file mode 100644
index 0000000..eabe115
--- /dev/null
+++ b/meta/recipes-support/libunistring/libunistring_0.9.3.bb
@@ -0,0 +1,28 @@
+SUMMARY = "libunistring provides functions for manipulating according to the Unicode standard."
+
+DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\
+ consist of very different scripts from Latin letters to Chinese Hanzi\
+ with many kinds of special characters accents, right-to-left writing\
+ marks, hyphens, Roman numbers, and much more. But the POSIX platform\
+ APIs for text do not contain adequate functions for dealing with\
+ particular properties of many Unicode characters. In fact, the POSIX\
+ APIs for text have several assumptions at their base which don't hold\
+ for Unicode text.  This library provides functions for manipulating\
+ Unicode strings and for manipulating C strings according to the Unicode\
+ standard.  This package contains documentation."
+
+HOMEPAGE = "http://www.gnu.org/software/libunistring/"
+SECTION = "devel"
+LICENSE = "GPLv3&LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" 
+
+SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f"
+SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3"
+
+PR = "r1"
+
+inherit autotools
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.6.5

[CONSOLIDATED PULL 29/33] guile: new recipe for autogen

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

guile recipe is needed by autogen.

Imported & updated  the guile-cross-config generation & guile-2.0.pc
manipulation code from the meta-oe guile recipe.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 ...01-Fix-the-SRFI-60-copy-bit-documentation.patch |   33 ++++++++
 ..._GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch |   25 ++++++
 ...h-rather-than-gc-gc_version.h-in-pthread-.patch |   26 +++++++
 .../guile/files/opensuse/guile-64bit.patch         |   38 ++++++++++
 .../files/opensuse/guile-turn-off-gc-test.patch    |   48 ++++++++++++
 meta/recipes-devtools/guile/guile_2.0.3.bb         |   79 ++++++++++++++++++++
 6 files changed, 249 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
 create mode 100644 meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
 create mode 100644 meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
 create mode 100644 meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
 create mode 100644 meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
 create mode 100644 meta/recipes-devtools/guile/guile_2.0.3.bb

diff --git a/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch b/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
new file mode 100644
index 0000000..e6df9b9
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Inappropriate [debian patch]
+
+From c53b49c63d7ed145fbaa3dde25063c407631f373 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sat, 23 Apr 2011 14:57:49 -0500
+Subject: Fix the SRFI 60 copy-bit documentation.
+
+---
+ libguile/srfi-60.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
+index 264f4cb..1ed3c9e 100644
+--- a/libguile/srfi-60.c
++++ b/libguile/srfi-60.c
+@@ -70,7 +70,7 @@ SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
+ 
+ 
+ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
+-            (SCM index, SCM n, SCM bit),
++            (SCM index, SCM n, SCM newbit),
+ 	    "Return @var{n} with the bit at @var{index} set according to\n"
+ 	    "@var{newbit}.  @var{newbit} should be @code{#t} to set the bit\n"
+ 	    "to 1, or @code{#f} to set it to 0.  Bits other than at\n"
+@@ -86,7 +86,7 @@ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
+   int bb;
+ 
+   ii = scm_to_ulong (index);
+-  bb = scm_to_bool (bit);
++  bb = scm_to_bool (newbit);
+ 
+   if (SCM_I_INUMP (n))
+     {
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch b/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
new file mode 100644
index 0000000..7176c76
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
@@ -0,0 +1,25 @@
+Upstream-Status: Inappropriate [debian patch]
+
+From 6614b8efc5a8d90a26a2b99308b909ac351b65e5 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sat, 23 Apr 2011 14:57:50 -0500
+Subject: Define _GNU_SOURCE to fix the GNU/kFreeBSD build.
+
+Author: Petr Salinger <Petr.Salinger@seznam.cz>
+Closes: #401168
+---
+ libguile/fports.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libguile/fports.c b/libguile/fports.c
+index 1348b8b..3ac3ced 100644
+--- a/libguile/fports.c
++++ b/libguile/fports.c
+@@ -20,6 +20,7 @@
+ 
+ \f
+ #define _LARGEFILE64_SOURCE      /* ask for stat64 etc */
++#define _GNU_SOURCE              /* ask for LONG_LONG_MAX/LONG_LONG_MIN */
+ 
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch b/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
new file mode 100644
index 0000000..aa64f58
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Inappropriate [debian patch]
+
+From 0c91fa9270e86b20bfb8e62db5ac84617b2567d9 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Thu, 10 Nov 2011 02:23:04 -0600
+Subject: Include gc.h rather than gc/gc_version.h in pthread test.
+
+See comments in recent gc_version.h.  It should never be included
+directly, and doing so was causing build failures.
+---
+ .../standalone/test-pthread-create-secondary.c     |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test-suite/standalone/test-pthread-create-secondary.c b/test-suite/standalone/test-pthread-create-secondary.c
+index fe39c2a..d87fb33 100644
+--- a/test-suite/standalone/test-pthread-create-secondary.c
++++ b/test-suite/standalone/test-pthread-create-secondary.c
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ #include <libguile.h>
+ 
+-#include <gc/gc_version.h>
++#include <gc.h>
+ 
+ 
+ /* Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
new file mode 100644
index 0000000..be3191a
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
@@ -0,0 +1,38 @@
+
+Upstream-Status: Inappropriate [opensuse patch]
+
+Index: guile-2.0.3/libguile/hash.c
+===================================================================
+--- guile-2.0.3.orig/libguile/hash.c	2011-07-06 15:49:59.000000000 -0700
++++ guile-2.0.3/libguile/hash.c	2012-01-13 21:49:43.332844884 -0800
+@@ -270,7 +270,7 @@ scm_hasher(SCM obj, unsigned long n, siz
+ unsigned long
+ scm_ihashq (SCM obj, unsigned long n)
+ {
+-  return (SCM_UNPACK (obj) >> 1) % n;
++  return ((unsigned long) SCM_UNPACK (obj) >> 1) % n;
+ }
+ 
+ 
+@@ -306,7 +306,7 @@ scm_ihashv (SCM obj, unsigned long n)
+   if (SCM_NUMP(obj))
+     return (unsigned long) scm_hasher(obj, n, 10);
+   else
+-    return SCM_UNPACK (obj) % n;
++    return (unsigned long) SCM_UNPACK (obj) % n;
+ }
+ 
+ 
+Index: guile-2.0.3/libguile/struct.c
+===================================================================
+--- guile-2.0.3.orig/libguile/struct.c	2011-07-06 15:50:00.000000000 -0700
++++ guile-2.0.3/libguile/struct.c	2012-01-13 21:49:43.332844884 -0800
+@@ -942,7 +942,7 @@ scm_struct_ihashq (SCM obj, unsigned lon
+ {
+   /* The length of the hash table should be a relative prime it's not
+      necessary to shift down the address.  */
+-  return SCM_UNPACK (obj) % n;
++  return (unsigned long) SCM_UNPACK (obj) % n;
+ }
+ 
+ SCM_DEFINE (scm_struct_vtable_name, "struct-vtable-name", 1, 0, 0, 
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
new file mode 100644
index 0000000..ed56694
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
@@ -0,0 +1,48 @@
+
+Upstream-Status: Inappropriate [opensuse patch]
+
+See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10096
+why this test is turned off.
+Index: guile-2.0.3/test-suite/tests/gc.test
+===================================================================
+--- guile-2.0.3.orig/test-suite/tests/gc.test	2011-10-15 09:34:40.000000000 -0700
++++ guile-2.0.3/test-suite/tests/gc.test	2012-01-13 21:52:10.282540355 -0800
+@@ -65,23 +65,23 @@
+       foo)))
+ 
+ 
+-(with-test-prefix "gc"
+-  (pass-if "Unused modules are removed"
+-    (let* ((guard (make-guardian))
+-           (total 1000))
+-
+-      (for-each (lambda (x) (guard (make-module))) (iota total))
++;;(with-test-prefix "gc"
++;;  (pass-if "Unused modules are removed"
++;;    (let* ((guard (make-guardian))
++;;           (total 1000))
++;;
++;;      (for-each (lambda (x) (guard (make-module))) (iota total))
+ 
+       ;; Avoid false references to the modules on the stack.
+-      (stack-cleanup 20)
++;;      (stack-cleanup 20)
+ 
+-      (gc)
+-      (gc) ;; twice: have to kill the weak vectors.
+-      (gc) ;; thrice: because the test doesn't succeed with only
++;;      (gc)
++;;      (gc) ;; twice: have to kill the weak vectors.
++;;      (gc) ;; thrice: because the test doesn't succeed with only
+            ;; one gc round. not sure why.
+ 
+-      (= (let lp ((i 0))
+-           (if (guard)
+-               (lp (1+ i))
+-               i))
+-         total))))
++;;      (= (let lp ((i 0))
++;;           (if (guard)
++;;               (lp (1+ i))
++;;               i))
++;;         total))))
diff --git a/meta/recipes-devtools/guile/guile_2.0.3.bb b/meta/recipes-devtools/guile/guile_2.0.3.bb
new file mode 100644
index 0000000..60fbe32
--- /dev/null
+++ b/meta/recipes-devtools/guile/guile_2.0.3.bb
@@ -0,0 +1,79 @@
+SUMMARY = "Guile is the GNU Ubiquitous Intelligent Language for Extensions."
+DESCRIPTION = "Guile is the GNU Ubiquitous Intelligent Language for Extensions,\
+ the official extension language for the GNU operating system.\
+ Guile is a library designed to help programmers create flexible applications.\
+ Using Guile in an application allows the application's functionality to be\
+ extended by users or other programmers with plug-ins, modules, or scripts.\
+ Guile provides what might be described as "practical software freedom,"\
+ making it possible for users to customize an application to meet their\
+ needs without digging into the application's internals."
+
+HOMEPAGE = "http://www.gnu.org/software/guile/"
+SECTION = "devel"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 
+
+SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
+           file://debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch \
+           file://debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch \
+           file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \
+           file://opensuse/guile-64bit.patch \
+           file://opensuse/guile-turn-off-gc-test.patch \
+           "
+
+SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
+SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
+
+PR = "r1"
+
+inherit autotools gettext
+BBCLASSEXTEND = "native"
+
+DEPENDS = "libunistring bdwgc gmp libtool libffi"
+# add guile-native only to the target recipe's DEPENDS
+DEPENDS += "${@['guile-native', ''][d.getVar('PN', 1) != 'guile']}"
+
+do_configure_prepend() {
+	mkdir -p po
+}
+
+export GUILE_FOR_BUILD=${BUILD_SYS}-guile
+
+do_compile_append() {
+	# just for target recipe
+	if [ "${PN}" == "guile" ]
+	then
+		sed -i -e s:${STAGING_DIR_TARGET}::g \
+	               -e s:/${TARGET_SYS}::g \
+	               -e s:-L/usr/lib::g \
+        	       -e s:-isystem/usr/include::g \
+	               -e s:,/usr/lib:,\$\{libdir\}:g \
+	                  meta/guile-2.0.pc
+	fi
+}
+
+do_install_append_virtclass-native() {
+	install -m 0755  ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
+}
+
+SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"
+
+guile_cross_config() {
+	# this is only for target recipe
+	if [ "${PN}" == "guile" ]
+	then
+	        # Create guile-config returning target values instead of native values
+	        install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
+        	echo '#!'`which ${BUILD_SYS}-guile`$' \\\n--no-auto-compile -e main -s\n!#\n(define %guile-build-info '\'\( \
+			> guile-config.cross
+	        sed -n -e 's:^[ \t]*{[ \t]*":  (:' \
+			-e 's:",[ \t]*": . ":' \
+			-e 's:" *}, *\\:"):' \
+			-e 's:^.*cachedir.*$::' \
+			-e '/^  (/p' \
+			< libguile/libpath.h >> guile-config.cross
+	        echo '))' >> guile-config.cross
+	        cat meta/guile-config >> guile-config.cross
+	        install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
+	fi
+}
-- 
1.7.6.5

[CONSOLIDATED PULL 30/33] autogen-native: new recipe for grub-efi-native

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

grub-efi-native build is failing due to missing autogen command.
Hence created this recipe.

The newer versions of autogen 5.13 & 5.14 both are dumping core while
building from source, so going back to the working 5.12 version.

Also noticed that no distro vendor has picked up 5.13 or 5.14 versions
of autogen yet.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../autogen/autogen-native_5.12.bb                 |   24 ++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/autogen/autogen-native_5.12.bb

diff --git a/meta/recipes-devtools/autogen/autogen-native_5.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.12.bb
new file mode 100644
index 0000000..cdf1ea9
--- /dev/null
+++ b/meta/recipes-devtools/autogen/autogen-native_5.12.bb
@@ -0,0 +1,24 @@
+SUMMARY = "AutoGen is a tool to manage programs that contain large amounts of repetitious text."
+DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\
+ maintenance of programs that contain large amounts of repetitious text.\
+ It is especially valuable in programs that have several blocks of text\
+ that must be kept synchronized."
+HOMEPAGE = "http://www.gnu.org/software/autogen/"
+SECTION = "devel"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 
+
+SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "6c6671b76021fb30dd43b0d5fdb7180b"
+SRC_URI[sha256sum] = "37e885d6c8a58f33ab198d38bb972fa4c14236f951d628161dde6e20527d0df2"
+
+PR = "r1"
+
+DEPENDS = "guile-native libtool-native libxml2-native"
+RDEPENDS = "automake pkgconfig"
+
+inherit autotools native
+
+# Following line will be needed for the non-native target recipe.
+#CFLAGS += "-L${STAGING_LIBDIR} -lguile-2.0 -lgc -pthread -I${STAGING_INCDIR}/guile/2.0 -I${STAGING_INCDIR}"
-- 
1.7.6.5

[CONSOLIDATED PULL 31/33] grub-efi-native: fix errors with automake 1.11.2

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This commit replaces earlier patch
(grub-1.99_fix_for_automake_1.11.2.patch) which did not work on all distros.

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>
---
 .../files/grub-1.99_fix_for_automake_1.11.2.patch  | 5808 --------------------
 meta/recipes-bsp/grub/grub-efi-native_1.99.bb      |    4 +-
 2 files changed, 2 insertions(+), 5810 deletions(-)

diff --git a/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
 b/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
index 1c70e4a..4d729e5 100644
--- a/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
+++ b/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
@@ -65,5612 +65,6 @@ Index: grub-1.99/Makefile.am
  
  
  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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF 
+][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodul
es +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF comm
on +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ END
IF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +]
[+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR t
erminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR 
x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ E
NDFOR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 terminfomodul
e +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x
86 +][+ 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 +][+ E
NDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu
 +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FO
R videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FO
R common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_q
emu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+
 FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i3
86 +] [+ 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 +][+ F
OR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc 
+][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [
+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodule
s +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDF
OR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 i
386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfom
odule +][+ .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 nosp
arc64 +][+ 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 +][+ .commo
n +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_coreb
oot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +]
[+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FO
R i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR termin
fomodule +][+ .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 n
osparc64 +][+ 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 +][+ .co
mmon +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ END
FOR +][+ 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 +] [+ ENDF
OR +][+ 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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 t
erminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ END
IF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ F
OR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [
+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ E
NDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +
][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomod
ules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF co
mmon +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/con
fig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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 +][+ .videoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR
 +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoink
ernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR
 +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF p
ci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nos
parc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .
nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDF
OR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDI
F +] $(top_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ END
FOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF 
+][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ 
ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(t
op_builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_iee
e1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] 
[+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ END
FOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfo
inkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosp
arc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR
 +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][
+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ END
IF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_
builddir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.sta
tus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/c
onfig.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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)/confi
g.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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_build
dir)/config.status
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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.st
atus
--	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_DATA),g' > $@
- 	chmod a+x grub_cmd_echo
- 	
- CLEANFILES += grub_cmd_echo
 Index: grub-1.99/gentpl.py
 ===================================================================
 --- grub-1.99.orig/gentpl.py
@@ -5684,205 +78,3 @@ Index: grub-1.99/gentpl.py
  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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_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@,$(pk
glib_DATA),g' > $@
-+	$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(p
kgdata_DATA),g' > $@
- 	chmod a+x genmod.sh
- 	
- CLEANFILES += genmod.sh
diff --git a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb b/meta/recipes-bsp/gr
ub/grub-efi-native_1.99.bb
index b976d1e..9bcc1cb 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
@@ -14,9 +14,9 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 # FIXME: We should be able to optionally drop freetype as a dependency
-DEPENDS = "help2man-native"
+DEPENDS = "help2man-native autogen-native"
 RDEPENDS_${PN} = "diffutils freetype"
-PR = "r3"
+PR = "r5"
 
 # Native packages do not normally rebuild when the target changes.
 # Ensure this is built once per HOST-TARGET pair.
-- 
1.7.6.5

[CONSOLIDATED PULL 32/33] distro-tracking: add data for newer recipes

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   21 ++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 0aed343..90924ed 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -37,6 +37,27 @@ RECIPE_MANUAL_CHECK_DATE_pn-libpcre = "Jan 10, 2012"
 RECIPE_MAINTAINER_pn-libpcre = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 DISTRO_PN_ALIAS_pn-libpcre = "Mandriva=libpcre0 Fedora=pcre"
 
+RECIPE_LATEST_VERSION_pn-bdwgc = "20110107"
+RECIPE_LAST_UPDATE_pn-bdwgc = "Jan 17, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-bdwgc = "Jan 17, 2012"
+RECIPE_MAINTAINER_pn-bdwgc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+
+RECIPE_LATEST_VERSION_pn-libunistring = "0.9.3"
+RECIPE_LAST_UPDATE_pn-libunistring = "Jan 17, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libunistring = "Jan 17, 2012"
+RECIPE_MAINTAINER_pn-libunistring = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+
+RECIPE_LATEST_VERSION_pn-guile = "2.0.3"
+RECIPE_LAST_UPDATE_pn-guile = "Jan 17, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-guile = "Jan 17, 2012"
+RECIPE_MAINTAINER_pn-guile = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+
+RECIPE_LATEST_VERSION_pn-autogen = "5.12"
+RECIPE_NO_UPDATE_REASON_pn-autogen = "newer versions are dumping core while building, and no distro has picked up the newer versions yet"
+RECIPE_LAST_UPDATE_pn-autogen = "Jan 17, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-autogen = "Jan 17, 2012"
+RECIPE_MAINTAINER_pn-autogen = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+
 RECIPE_STATUS_pn-libsoup = "red"
 RECIPE_LATEST_VERSION_pn-libsoup = "check"
 RECIPE_LAST_UPDATE_pn-libsoup = "Sep 22, 2008"
-- 
1.7.6.5

[CONSOLIDATED PULL 33/33] gnutls: Fix configure issue wrt to rm

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

Add -f option so if the files dont exist then we can
still continue. Fixes errors like

| + do_configure
| + for dir in . lib libextra
| + rm ./aclocal.m4 ./m4/libtool.m4 './m4/lt*.m4'
| rm: cannot remove `./m4/libtool.m4': No such file or directory
| rm: cannot remove `./m4/lt*.m4': No such file or directory

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/gnutls/gnutls.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 5991540..c639b11 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
 DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
@@ -31,7 +31,7 @@ EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
               "
 do_configure_prepend() {
 	for dir in . lib libextra; do
-		rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
+		rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
 	done
 }
 
-- 
1.7.6.5

Re: [CONSOLIDATED PULL 02/33] busybox: defconfig modified in order to activate CONFIG_EXPR_MATH_SUPPORT_64

[Koen Kooi]

Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:

> From: Andrei Gherzan <andrei.gherzan@windriver.com>
> 
> Enable 64-bit math support in the expr applet. This will make
> the applet slightly larger, but will allow computation with very
> large numbers.

So it finally supports yocto now?

Re: [CONSOLIDATED PULL 12/33] pkgconfig: Move pkg.m4 from -dev to package

[Koen Kooi]

Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:

> [YOCTO #1908]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
> meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> index 641bfae..00c23d7 100644
> --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> @@ -31,3 +31,5 @@ do_configure_prepend () {
> }
> 
> BBCLASSEXTEND = "native nativesdk"
> +
> +FILES_${PN} += "${datadir}/aclocal/pkg.m4"

Why is this done exactly? M4 files do belong in the -dev package.

Re: [CONSOLIDATED PULL 12/33] pkgconfig: Move pkg.m4 from -dev to package

[Richard Purdie]

On Thu, 2012-01-19 at 11:30 +0100, Koen Kooi wrote:
> Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:
> 
> > [YOCTO #1908]
> > 
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> > meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
> > meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
> > 2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> > index 641bfae..00c23d7 100644
> > --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> > +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> > @@ -31,3 +31,5 @@ do_configure_prepend () {
> > }
> > 
> > BBCLASSEXTEND = "native nativesdk"
> > +
> > +FILES_${PN} += "${datadir}/aclocal/pkg.m4"
> 
> Why is this done exactly? M4 files do belong in the -dev package.

Think about the use cases for having pkgconfig installed. In the
pkgconfig case, the -dev package isn't particularly useful. 

You can argue this one both ways though...

Cheers,

Richard

Re: [CONSOLIDATED PULL 12/33] pkgconfig: Move pkg.m4 from -dev to package

[Koen Kooi]

Op 19 jan. 2012, om 11:57 heeft Richard Purdie het volgende geschreven:

> On Thu, 2012-01-19 at 11:30 +0100, Koen Kooi wrote:
>> Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:
>> 
>>> [YOCTO #1908]
>>> 
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>> ---
>>> meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    2 ++
>>> meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
>>> 2 files changed, 3 insertions(+), 1 deletions(-)
>>> 
>>> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
>>> index 641bfae..00c23d7 100644
>>> --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
>>> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
>>> @@ -31,3 +31,5 @@ do_configure_prepend () {
>>> }
>>> 
>>> BBCLASSEXTEND = "native nativesdk"
>>> +
>>> +FILES_${PN} += "${datadir}/aclocal/pkg.m4"
>> 
>> Why is this done exactly? M4 files do belong in the -dev package.
> 
> Think about the use cases for having pkgconfig installed. In the
> pkgconfig case, the -dev package isn't particularly useful. 

So put that in the commit message :)

> 
> You can argue this one both ways though...

I know, just being obnoxious about missing commit messages.

Re: [CONSOLIDATED PULL 00/33] patches and staticdev fixes

[Richard Purdie]

On Thu, 2012-01-19 at 01:22 -0800, Saul Wold wrote:
> Andrea Adami (1):
>   xinput: add utility for configuring and testing XInput devices.
> 
> Andrei Gherzan (3):
>   busybox: defconfig modified in order to activate
>     CONFIG_EXPR_MATH_SUPPORT_64
>   chkconfig: Update package from v1.3.55 to v1.3.57
>   libsoup: Update package from v2.2.100 to v2.2.105
> 
> Bruce Ashfield (1):
>   linux-yocto: restore WORKDIR as a patch source directory
> 
> Joshua Lock (6):
>   busybox: drop MARKINT option from init script and syslog-startup.conf
>   busybox: remove incorrect comments from syslog-startup.conf
>   busybox: enable log level configuration in syslog-startup.conf and
>     script
>   busybox: change syslog default to log to a file
>   busybox: enable dropping of duplicates in syslog, off by default
>   distro-tracking-fields: claim responsibility for udev, dpkg, apt,
>     v86d
> 
> Khem Raj (4):
>   gnutls: Fix compilation on uclibc
>   uclibc: Upgrade to latest master
>   e2fsprogs_1.42.bb: Fix build fallout for uclibc
>   gnutls: Fix configure issue wrt to rm
> 
> Lianhao Lu (1):
>   adt-installer: install autoconf(/automake)-nativesdk
> 
> Nitin A Kamble (7):
>   site/ix86-common: fix an error
>   bdwgc: new recipe for autogen
>   libunistring: new recipe for autogen
>   guile: new recipe for autogen
>   autogen-native: new recipe for grub-efi-native
>   grub-efi-native: fix errors with automake 1.11.2
>   distro-tracking: add data for newer recipes
> 
> Saul Wold (10):
>   m4: A better refactoring
>   pango.inc: fix /etc/pango -> /${sysconfdir}/pango/*
>   pkgconfig: Move pkg.m4 from -dev to  package
>   gst-openmax: refactor packages for staticdev
>   liba52: refactor packages for staticdev
>   attr/acl: refactor packages for staticdev
>   db: refactor packages for staticdev
>   js: refactor packages for staticdev
>   boost: refactor packages for staticdev
>   enchant: refactor packages for staticdev

Merged to master, thanks. I tweaked the pkgconfig commit message.

Cheers,

Richard

Re: [CONSOLIDATED PULL 02/33] busybox: defconfig modified in order to activate CONFIG_EXPR_MATH_SUPPORT_64

[Andrei Gherzan]

On 01/19/2012 12:29 PM, Koen Kooi wrote:
> Op 19 jan. 2012, om 10:22 heeft Saul Wold het volgende geschreven:
>
>> From: Andrei Gherzan<andrei.gherzan@windriver.com>
>>
>> Enable 64-bit math support in the expr applet. This will make
>> the applet slightly larger, but will allow computation with very
>> large numbers.
> So it finally supports yocto now?
>
> ___________________
Yes. Saul merged this commit.
> ____________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core