From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 20 Oct 2004 09:48:59 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~16523
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c799b65a9f9fec777ea8b8666382b6a1fc4ee1a9;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/20 11:48:43+02:00 uni-frankfurt.de!mickeyl
make pkgconfig.oeclass work even if /usr and friends are in your build path

BKrev: 4176348bt-jimoUXFXpdC8-8ggKevg
---

diff --git a/classes/pkgconfig.oeclass b/classes/pkgconfig.oeclass
index 83f3a3d9f2..5e15a2ac97 100644
--- a/classes/pkgconfig.oeclass
+++ b/classes/pkgconfig.oeclass
@@ -2,15 +2,21 @@ inherit base
 
 DEPENDS_prepend = "pkgconfig-native "
 
+# The namespaces can clash here hence the two step replace
 def get_pkgconfig_mangle(d):
 	import oe.data
 	s = "-e ''"
 	if not oe.data.inherits_class('native', d):
-		s += " -e 's:${libdir}:${STAGING_LIBDIR}:;'"
-		s += " -e 's:${includedir}:${STAGING_INCDIR}:;'"
-		s += " -e 's:${datadir}:${STAGING_DATADIR}:'"
-		s += " -e 's:${prefix}:${STAGING_LIBDIR}/..:'"
-		s += " -e 's:${exec_prefix}:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:${libdir}:OELIBDIR:;'"
+		s += " -e 's:${includedir}:OEINCDIR:;'"
+		s += " -e 's:${datadir}:OEDATADIR:'"
+		s += " -e 's:${prefix}:OEPREFIX:'"
+		s += " -e 's:${exec_prefix}:OEEXECPREFIX:'"
+		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}/..:'"
 	return s
 
 do_stage_append () {