summaryrefslogtreecommitdiff
path: root/meta/classes/binconfig.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:10:08 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:10:08 +0000
commitb17670211a86799c101394dcaa7f1ed88758ddde (patch)
tree3fc555d85a85d4ad9e658a52316bab98aacf5f0a /meta/classes/binconfig.bbclass
parent0e09147de182aeb96cff9ff59211b3d907ba83f7 (diff)
downloadopenembedded-core-b17670211a86799c101394dcaa7f1ed88758ddde.tar.gz
openembedded-core-b17670211a86799c101394dcaa7f1ed88758ddde.tar.bz2
openembedded-core-b17670211a86799c101394dcaa7f1ed88758ddde.zip
Remove hardcoded staging layout assumptions
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3117 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/binconfig.bbclass')
-rw-r--r--meta/classes/binconfig.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 497b78f454..4e425a76d6 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -16,8 +16,8 @@ def get_binconfig_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:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
return s
@@ -33,7 +33,7 @@ do_install_append() {
-e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-e 's:${STAGING_INCDIR}:${includedir}:g;' \
-e 's:${STAGING_DATADIR}:${datadir}:' \
- -e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config`
+ -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config`
done
fi
@@ -42,7 +42,7 @@ do_install_append() {
-e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-e 's:${STAGING_INCDIR}:${includedir}:g;' \
-e 's:${STAGING_DATADIR}:${datadir}:' \
- -e 's:${STAGING_LIBDIR}/..:${prefix}:' \
+ -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \
$lafile
done
}