Remove hardcoded staging layout assumptions

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

2 files changed, 4 insertions, 4 deletions

diff --git a/meta/packages/maemo/xpext_1.0-5.bb b/meta/packages/maemo/xpext_1.0-5.bb
index cc40205c50..343db15223 100644
--- a/meta/packages/maemo/xpext_1.0-5.bb
+++ b/meta/packages/maemo/xpext_1.0-5.bb
@@ -18,10 +18,10 @@ do_configure_prepend () {
 }
 
 do_stage() {
-        oe_runmake install prefix=${STAGING_DIR} \
+        oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
                bindir=${STAGING_BINDIR} \
                includedir=${STAGING_INCDIR} \
                libdir=${STAGING_LIBDIR} \
                datadir=${STAGING_DATADIR} \
-               mandir=${STAGING_DATADIR}/man
+               mandir=${STAGING_DIR_HOST}${layout_mandir}
 }
diff --git a/meta/packages/maemo/xsp_1.0.0-8.bb b/meta/packages/maemo/xsp_1.0.0-8.bb
index d5f94c64cd..878ddec508 100644
--- a/meta/packages/maemo/xsp_1.0.0-8.bb
+++ b/meta/packages/maemo/xsp_1.0.0-8.bb
@@ -11,10 +11,10 @@ S = "${WORKDIR}/Xsp"
 inherit autotools pkgconfig
 
 do_stage() {
-        oe_runmake install prefix=${STAGING_DIR} \
+        oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
                bindir=${STAGING_BINDIR} \
                includedir=${STAGING_INCDIR} \
                libdir=${STAGING_LIBDIR} \
                datadir=${STAGING_DATADIR} \
-               mandir=${STAGING_DATADIR}/man
+               mandir=${STAGING_DIR_HOST}${layout_mandir}
 }