[oe-commits] org.oe.dev pkgconfig.bbclass: more munging

[koen commit]

pkgconfig.bbclass: more munging

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 0c329f0e5326e8732ad8e2ca35f9430e3d1867a7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c329f0e5326e8732ad8e2ca35f9430e3d1867a7
Files:
1
classes/pkgconfig.bbclass
Diffs:

#
# mt diff -re444b83e606f4844f9c6531052624f5c7d2cd139 -r0c329f0e5326e8732ad8e2ca35f9430e3d1867a7
#
# 
# 
# patch "classes/pkgconfig.bbclass"
#  from [0640502b335626fbfb58ae88b1b95ee44d078148]
#    to [7fbd67747ce8dbd5a57e8e7b03e4b94c34647b0c]
# 
============================================================
--- classes/pkgconfig.bbclass	0640502b335626fbfb58ae88b1b95ee44d078148
+++ classes/pkgconfig.bbclass	7fbd67747ce8dbd5a57e8e7b03e4b94c34647b0c
@@ -24,7 +24,7 @@ do_install_append () {
 
 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
 }