summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-07-29 20:22:07 +0000
committerPhil Blundell <philb@gnu.org>2004-07-29 20:22:07 +0000
commita984159bf0476b6c2ec1d9efb0d7b7686b5992e5 (patch)
treeaa2ecedb7f9e85a36045b8a74aeff9bfb968423f /classes
parentff27ae7f7eab4445a39e7bd7539243c6ec5f3540 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into workhouse.nexus.co.uk:/home/pb/oe/oe-packages 2004/07/29 21:21:11+01:00 nexus.co.uk!pb add libgmime, courtesy Wookey 2004/07/28 21:59:03+01:00 nexus.co.uk!pb Merge bk://openembedded@openembedded.bkbits.net/packages into workhouse.nexus.co.uk:/home/pb/oe/oe-packages 2004/07/28 09:55:29+01:00 nexus.co.uk!pb Merge bk://openembedded@openembedded.bkbits.net/packages into workhouse.nexus.co.uk:/home/pb/oe/oe-packages 2004/07/28 09:23:14+01:00 nexus.co.uk!pb apply patch from Peter Naulls to fix excessive path rewriting when TMPDIR is in a subdirectory of ${prefix} BKrev: 41095c6flXF2RxMiq3TPlyxYNzu1fw
Diffstat (limited to 'classes')
-rw-r--r--classes/pkgconfig.oeclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/pkgconfig.oeclass b/classes/pkgconfig.oeclass
index 83f3a3d9f2..d791e626ec 100644
--- a/classes/pkgconfig.oeclass
+++ b/classes/pkgconfig.oeclass
@@ -6,11 +6,11 @@ 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}$:${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}/..:'"
return s
do_stage_append () {