From: Richard Purdie <richard@openedhand.com>
Date: Mon, 12 Nov 2007 11:19:54 +0000 (+0000)
Subject: pkgconfig.bbclass: Fix hardcoded staging layout references
X-Git-Tag: 2011-1~10300
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4285b621bfed3cc41a7a07a6ff714175703117ee;p=openembedded-core.git

pkgconfig.bbclass: Fix hardcoded staging layout references

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

diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass
index 3d99be63ef..e2751d0ef3 100644
--- a/meta/classes/pkgconfig.bbclass
+++ b/meta/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}:'"
 	return s
 
 do_stage_append () {