autotools.bbclass, distutils-common-base.bbclass, bitbake.conf: Fully support datadir...

* http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-April/009963.html

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 20f371a987a20dc566a1ff9fc3bda15f1fa1c0d6..e43b289c56242fc5ebb1e07adc09fd7d4126ff99 100644 (file)
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -231,6 +231,10 @@ autotools_stage_all() {
                        echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
                        cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
                fi
+               if [ -e ${STAGE_TEMP}/${datadir}/pkgconfig/ ] ; then
+                       echo "cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/"
+                       cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/
+               fi
        fi
        rm -rf ${STAGE_TEMP}/${mandir} || true
        rm -rf ${STAGE_TEMP}/${infodir} || true

diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass
index 068eac4de8cf1034053327aada35f8884f5bdedd..9ca392b84a344c5e0f6e9b4ce70373b530fc9a7c 100644 (file)
--- a/classes/distutils-common-base.bbclass
+++ b/classes/distutils-common-base.bbclass
@@ -17,6 +17,7 @@ PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
 FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
 
 FILES_${PN}-dev += "\
+  ${datadir}/pkgconfig \
   ${libdir}/pkgconfig \
   ${libdir}/${PYTHON_DIR}/site-packages/*.la \
 "

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index e5073a1b9354c7f219fdb3c7ec238e9280c9aefc..30ee0ae9bc2771801635379eb618657e7ed6c21e 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -224,7 +224,7 @@ 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"
+                ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
 RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})"