[oe-commits] Stanislav Brabec : autotools.bbclass, distutils-common-base.bbclass, bitbake.conf: Fully support datadir/pkgconfig...

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f06fc1880b1cd1925116916b7949c2032a15a4d0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f06fc1880b1cd1925116916b7949c2032a15a4d0

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Sat Apr 18 12:59:58 2009 +0000

autotools.bbclass, distutils-common-base.bbclass, bitbake.conf: Fully support datadir/pkgconfig...
* http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-April/009963.html

---

 classes/autotools.bbclass             |    4 ++++
 classes/distutils-common-base.bbclass |    1 +
 conf/bitbake.conf                     |    2 +-
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 20f371a..e43b289 100644
--- 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 068eac4..9ca392b 100644
--- 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 e5073a1..30ee0ae 100644
--- 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})"