merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'

     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'

1 files changed, 2 insertions, 2 deletions

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index cd6e04731e..3256977517 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d):
 
 do_install_append () {
         for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
-                sed -i ${@get_pkgconfig_mangle(d)} ${pc}
+                sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc}
         done
 }
 
@@ -32,6 +32,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)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname
 	done
 }