Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 3 insertions, 1 deletions

diff --git a/openembedded/packages/pkgconfig/pkgconfig_0.15.0.bb b/openembedded/packages/pkgconfig/pkgconfig_0.15.0.bb
index e38e20438d..31fc7820fe 100644
--- a/openembedded/packages/pkgconfig/pkgconfig_0.15.0.bb
+++ b/openembedded/packages/pkgconfig/pkgconfig_0.15.0.bb
@@ -5,10 +5,11 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://www.freedesktop.org/software/pkgconfig/"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \
            file://configure.patch;patch=1 \
+           file://pkg.m4 \
            file://glibconfig-sysdefs.h"
 
 inherit autotools 
@@ -16,6 +17,7 @@ inherit autotools
 acpaths = "-I ."
 do_configure_prepend () {
         install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+        install -m 0644 ${WORKDIR}/pkg.m4 ${S}/
 }
 
 do_stage_append() {