From b4bef9ad8e72b0d9ea29d6e2e6c6632dff93bdab Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 20 Aug 2010 08:38:04 -0700 Subject: 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 --- meta/conf/bitbake.conf | 3 ++- meta/packages/udev/udev-new.inc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 31d8668d11..788ba4efe9 100644 --- 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 b09c748f41..87f9633473 100644 --- 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 \ -- cgit v1.2.3-54-g00ecf