bitbake.conf: PKG_CONFIG_PATH is a PATH like variable and may contain multiple entrie...

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1731 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass
index f2054b0b07b2254b40a219cfd019181a1a03587d..416f34bb5cfbdb9b2157193794d0d72021d13342 100644 (file)
--- a/meta/classes/pkgconfig.bbclass
+++ b/meta/classes/pkgconfig.bbclass
@@ -23,6 +23,6 @@ do_stage_append () {
        for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
                pcname=`basename $pc`
                install -d ${PKG_CONFIG_PATH}
-               cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname
+               cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_DIR}/$pcname
        done
 }

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 804b7fd444ca30f6db5a8556a16132af4aa29871..cb5069ab6799f154aed0cea6c9c69335feb11266 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -393,7 +393,8 @@ SLOT = "0"
 
 # Other
 
-export PKG_CONFIG_PATH = "${STAGING_DATADIR}/pkgconfig"
+export PKG_CONFIG_DIR = "${STAGING_DATADIR}/pkgconfig"
+export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 
 export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"