bitbake.conf: Add shared/pkgconfig files to standard -dev glob

Add the pkgconfig files that may appear into the shared directory into
the -dev globbing.

Also change the udev integration to remove the manual instance of the
shared directory .pc file.

Signed-off-by: Mark Hatle <mhatle@windriver.com>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 31d8668d115ccc0ad8339c9b402aaaae8ae318c3..788ba4efe99f6d61a83453a5923a9ac2942368dc 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -210,7 +210,8 @@ SECTION_${PN}-doc = "doc"
 
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
-                ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+                ${datadir}/pkgconfig ${datadir}/aclocal \
+                ${base_libdir}/*.a ${base_libdir}/*.o"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
 RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})"

diff --git a/meta/packages/udev/udev-new.inc b/meta/packages/udev/udev-new.inc
index b09c748f41ba16dc0c0e93911b06201eedbdc6e9..87f9633473042386a3de0dc319f224d53f34f00e 100644 (file)
--- a/meta/packages/udev/udev-new.inc
+++ b/meta/packages/udev/udev-new.inc
@@ -47,9 +47,9 @@ INITSCRIPT_PARAMS_udev = "start 04 S ."
 INITSCRIPT_NAME_udev-cache = "udev-cache"
 INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
 
-FILES_${PN} += "${libexecdir} ${datadir}/pkgconfig/udev.pc ${libdir}/ConsoleKit"
+FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
 FILES_${PN}-dbg += "${libexecdir}/.debug"
-FILES_${PN}-dev = ""
+FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
 FILES_libudev = "${base_libdir}/libudev.so.*"
 FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
 FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \