propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)

            to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)

1 files changed, 3 insertions, 3 deletions

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index c795c8a709..d2176d8b39 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -15,8 +15,8 @@ def get_pkgconfig_mangle(d):
 		s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
 		s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
 		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
-		s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
-		s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'"
+		s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
 		s += " -e 's:-L${WORKDIR}\S*: :g'"
 		s += " -e 's:-I${WORKDIR}\S*: :g'"
 
@@ -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)} -e 's:${D}::g' ${pc}
+                sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' -e 's:${STAGING_DIR_TARGET}:${prefix}:g' ${pc}
         done
 }