Remove hardcoded staging layout assumptions

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

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        
 }