From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 19 Jan 2012 00:00:57 +0000 (-0800)
Subject: pkgconfig: Move pkg.m4 from -dev to  package
X-Git-Tag: 2015-4~12002
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=80fdf2cf2b048d7c2e8dff9c47490f47fc62e820;p=openembedded-core.git

pkgconfig: Move pkg.m4 from -dev to  package

If pkgconfig is installed you're doing development work and the -dev package
makes little sense in the pkgconfig case. Keeping the .m4 file associated with
the main package therefore makes more sense than having the user install both.

[YOCTO #1908]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 641bfae373..00c23d7ff8 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 76c0df916d..1d7ba49b95 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"