summaryrefslogtreecommitdiff
path: root/classes/binconfig.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-11-17 23:21:03 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-11-17 23:21:03 +0000
commit4b751ba2557d2e3f448f92589ee0c9d5e30f6388 (patch)
tree1d6d10ef0f954314d31dba063faa454bf33d05f1 /classes/binconfig.bbclass
parent702d82aa16bb05d638353677359846af2d125674 (diff)
classes: Sync staging layout cleanups from Poky
Diffstat (limited to 'classes/binconfig.bbclass')
-rw-r--r--classes/binconfig.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 497b78f454..4e425a76d6 100644
--- a/classes/binconfig.bbclass
+++ b/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
}