merge of '0392f48f534dce561d4b8cb01e8db5ad64500222'

     and 'a141267452dde7cd1e229a81095e09d64b4c3e9d'

31 files changed, 60 insertions, 82 deletions

diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb
index 89bcfa85d9..629c50a3ca 100644
--- a/packages/ark3116/ark3116_0.4.1.bb
+++ b/packages/ark3116/ark3116_0.4.1.bb
@@ -25,8 +25,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}"
 
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial
diff --git a/packages/callweaver/callweaver_1.2.0-rc5.bb b/packages/callweaver/callweaver_1.2.0-rc5.bb
index 608181f96c..32869936b6 100644
--- a/packages/callweaver/callweaver_1.2.0-rc5.bb
+++ b/packages/callweaver/callweaver_1.2.0-rc5.bb
@@ -29,9 +29,9 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \
+EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-low_memory \
         --disable-zaptel --with-directory-layout=lsb --enable-t38 \
-        --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \
+        --with-codec-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
         --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \
         --with-javascript --with-res_js \
         --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \
diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb
index 7230f985f6..2eef27e9a3 100644
--- a/packages/dejagnu/dejagnu-qemu_1.0.bb
+++ b/packages/dejagnu/dejagnu-qemu_1.0.bb
@@ -13,7 +13,7 @@ do_stage() {
 	install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/
 	cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper
 #!/bin/sh
-exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1
+exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1
 EOF
 	chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper
 }
diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb
index 5975a29e7c..3878829ce5 100644
--- a/packages/dtnrg/dtn_2.5.0.bb
+++ b/packages/dtnrg/dtn_2.5.0.bb
@@ -3,29 +3,30 @@ HOMEPAGE = "http://www.dtnrg.org/wiki"
 SECTION = "libs"
 DEPENDS = "db openssl python-native xerces-c"
 LICENSE = "Apache"
-SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
-PR = "r2"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \
+           file://configure_fix.patch;patch=1"
+PR = "r3"
 
 inherit autotools
 
 EXTRA_OECONF = "\
   --with-python=${STAGING_BINDIR_NATIVE}/python \
-  --with-db=${STAGING_DIR} \
-  --with-tcl=${STAGING_DIR} \
+  --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
+  --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-google-perftools \
   --without-bluez \
   --without-bonjour \
-  --with-expat=${STAGING_DIR} \
-  --with-xerces-c=${STAGING_DIR} \
+  --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \
+  --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-tclreadline \
-  --with-zlib=${STAGING_DIR} \
+  --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-xsd-tool \
-  --with-db=${STAGING_DIR} \
+  --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --enable-ecl \
   --enable-edp \
   --without-mysql \
   --without-postgres \
-  --with-openssl=${STAGING_DIR} \
+  --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \
 "
 
 def dtn_python_dir(d):
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index e8f263d1a9..4a406d6516 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -26,7 +26,7 @@ FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
 
 FILES_${PN} += "${datadir}/emacs"
 
-QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}"
 LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"
diff --git a/packages/erlang/erlang_R11B.1.bb b/packages/erlang/erlang_R11B.1.bb
index 4c754f6c3e..e85a297ff9 100644
--- a/packages/erlang/erlang_R11B.1.bb
+++ b/packages/erlang/erlang_R11B.1.bb
@@ -11,7 +11,7 @@ SRC_URI += "file://erts-configure.in.patch;patch=1 \
 
 EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
 
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe"
 EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe"
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index 5ce1c0b58c..631c2d7933 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -15,8 +15,8 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
                 --without-sdl --disable-video --enable-alsa \
-                --with-osip=${STAGING_DIR}/${HOST_SYS} \
-                --with-readline=${STAGING_DIR}/${HOST_SYS} \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --disable-truespeech --disable-manual \
                 --disable-glibtest --disable-glib --disable-strict"
 
diff --git a/packages/gpgme/gpgme.inc b/packages/gpgme/gpgme.inc
index dc8df2c85f..71cd68fa2b 100644
--- a/packages/gpgme/gpgme.inc
+++ b/packages/gpgme/gpgme.inc
@@ -5,7 +5,7 @@ DEPENDS = "libgpg-error pth libassuan"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
 
-EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST}${layout_exec_prefix} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
 
 LEAD_SONAME = "libgpgme.so"
 
diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb
index 057b8a48eb..9648e9ef0c 100644
--- a/packages/gxine/gxine_0.4.1.bb
+++ b/packages/gxine/gxine_0.4.1.bb
@@ -36,7 +36,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz \
 EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
 		--libdir=${STAGING_LIBDIR} \
 		--disable-xinetest \
-		--with-xine-prefix=${STAGING_DIR}/${HOST_SYS}"
+		--with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 LDFLAGS += "-lxine"
 
diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb
index 7245d1de13..96776645ab 100644
--- a/packages/gxine/gxine_0.4.1enhanced.bb
+++ b/packages/gxine/gxine_0.4.1enhanced.bb
@@ -39,7 +39,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \
 EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
 		--libdir=${STAGING_LIBDIR} \
 		--disable-xinetest \
-		--with-xine-prefix=${STAGING_DIR}/${HOST_SYS}"
+		--with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 LDFLAGS += "-lxine"
 
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index 9acfc71204..a84f47d471 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -35,9 +35,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \
 	--with-extra-includes=${STAGING_INCDIR} \
 	--with-extra-libs=${STAGING_LIBDIR} \
 	--with-ssl-version=0.9.7e \
-	--with-ssl-dir=${STAGING_LIBDIR}/.. \
-	--with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \
-	--with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \
+	--with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+	--with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+	--with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
 	--enable-fontsubs \
 	--with-konq-tmp-prefix=/tmp/kde-cache \
 #	--enable-static \
diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb
index 02e411e9f7..3fb8a5cfa6 100644
--- a/packages/konqueror/konqueror-embedded_20070212.bb
+++ b/packages/konqueror/konqueror-embedded_20070212.bb
@@ -36,9 +36,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \
 	--with-extra-libs=${STAGING_LIBDIR} \
 	--with-qtopia-dir=${OPIEDIR} \
 	--with-ssl-version=0.9.7e \
-	--with-ssl-dir=${STAGING_LIBDIR}/.. \
-	--with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \
-	--with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \
+	--with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+	--with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+	--with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
 	--with-qt-dir=${QTDIR} \
 	--enable-fontsubs \
 	--with-konq-tmp-prefix=/tmp/kde-cache \
diff --git a/packages/libaio/libaio_0.3.103.bb b/packages/libaio/libaio_0.3.103.bb
index b0bc73617e..1453599855 100644
--- a/packages/libaio/libaio_0.3.103.bb
+++ b/packages/libaio/libaio_0.3.103.bb
@@ -26,8 +26,8 @@ do_unpack() {
 }
 
 do_stage () {
-	#make install prefix='${STAGING_DIR}/${TARGET_SYS}'
-        install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h
+	#make install prefix='${STAGING_DIR_TARGET}${layout_prefix}'
+        install -D -m 644 src/libaio.h ${STAGING_INCDIR}/libaio.h
 	oe_libinstall -so -C src libaio ${STAGING_LIBDIR}
 
 }
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
index 2ae61eeaf5..d4fadc401b 100644
--- a/packages/libxslt/libxslt_1.1.17.bb
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -32,8 +32,8 @@ do_stage () {
 		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
 	done
 
-	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \
 			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
 			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
 	chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb
index 05998f889d..f96bd66b82 100644
--- a/packages/linphone/linphone_1.3.99.8.bb
+++ b/packages/linphone/linphone_1.3.99.8.bb
@@ -15,9 +15,9 @@ inherit autotools
 
 EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
                 --without-sdl --disable-video --enable-alsa \
-                --with-osip=${STAGING_DIR}/${HOST_SYS} \
-                --with-readline=${STAGING_DIR}/${HOST_SYS} \
-                --with-speex=${STAGING_DIR}/${HOST_SYS} \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --disable-truespeech --disable-manual \
                 --disable-glibtest --disable-glib"
 
diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb
index 7a90cdd5c9..fe40b6a270 100644
--- a/packages/linphone/linphone_1.6.0.bb
+++ b/packages/linphone/linphone_1.6.0.bb
@@ -32,9 +32,9 @@ export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config
 EXTRA_OECONF = "--disable-gtk-doc \
                 --without-ffmpeg --disable-video --without-sdl \
                 --enable-alsa \
-                --with-osip=${STAGING_DIR}/${HOST_SYS} \
-                --with-readline=${STAGING_DIR}/${HOST_SYS} \
-                --with-speex=${STAGING_DIR}/${HOST_SYS} \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --disable-truespeech --disable-manual \
                 --disable-gnome_ui"
 
diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb
index e679e25b8d..19a0d43e33 100644
--- a/packages/ltrace/ltrace_0.4.bb
+++ b/packages/ltrace/ltrace_0.4.bb
@@ -17,7 +17,7 @@ EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \
 		INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \
 		INSTALL_DIR='$(INSTALL) -p -d -m 0755' "
 
-export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}"
 
 do_configure_prepend() {
 	ln -sf ./linux-gnu sysdeps/linux-gnueabi
diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb
index cc40205c50..71fcad27cf 100644
--- a/packages/maemo/xpext_1.0-5.bb
+++ b/packages/maemo/xpext_1.0-5.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
@@ -18,10 +18,5 @@ do_configure_prepend () {
 }
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index d5f94c64cd..f4f872e57f 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/packages/maemo/xsp_1.0.0-8.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
@@ -11,10 +11,5 @@ S = "${WORKDIR}/Xsp"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index a42498cfd4..1a60ab17a2 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -7,10 +7,5 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       infodir=${STAGING_DIR}/${HOST_SYS}/info
+	autotools_stage_all
 }
diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb
index 92fbe7bd4b..869c4227e2 100644
--- a/packages/mpfr/mpfr_2.3.0.bb
+++ b/packages/mpfr/mpfr_2.3.0.bb
@@ -7,9 +7,5 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-               datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/mpfr/mpfr_svn.bb b/packages/mpfr/mpfr_svn.bb
index da6036e69f..f1e9273a65 100644
--- a/packages/mpfr/mpfr_svn.bb
+++ b/packages/mpfr/mpfr_svn.bb
@@ -8,9 +8,5 @@ SRC_URI = "svn://scm.gforge.inria.fr/svn/mpfr;module=trunk"
 S = "${WORKDIR}/trunk"
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb
index 5fd7255fed..4f802dbcf6 100644
--- a/packages/netatalk/netatalk_2.0.3.bb
+++ b/packages/netatalk/netatalk_2.0.3.bb
@@ -17,13 +17,13 @@ inherit autotools update-rc.d
 
 do_configure () {
 	autoreconf
-	ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_DIR}/${TARGET_SYS}/lib" ./configure \
+	ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_LIBDIR}" ./configure \
 		--build=${BUILD_SYS} \
 		--host=${HOST_SYS} \
 		--target=${TARGET_SYS} \
 		--prefix=${prefix} \
-		--with-bdb=${STAGING_DIR}/${TARGET_SYS} \
-		--with-ssl-dir=${STAGING_DIR}/${TARGET_SYS} \
+		--with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \
+		--with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix} \
 		--without-shadow \
 		--sysconfdir=${sysconfdir} \
 		--disable-nls \
diff --git a/packages/pax-utils/pax-utils-native_0.1.13.bb b/packages/pax-utils/pax-utils-native_0.1.13.bb
index 52f5d59515..5a56c01aa4 100644
--- a/packages/pax-utils/pax-utils-native_0.1.13.bb
+++ b/packages/pax-utils/pax-utils-native_0.1.13.bb
@@ -3,7 +3,7 @@ inherit native
 require pax-utils_${PV}.bb
 
 do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install
+    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
 }
 
 do_install() {
diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb
index 4ed88cf411..890d467c10 100644
--- a/packages/php/php_5.2.0.bb
+++ b/packages/php/php_5.2.0.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = "    --without-iconv \
                     --enable-embedded-mysqli \
                     --enable-magic-quotes \
     		    --with-zlib \
-                    --with-mysql="${STAGING_DIR}/${TARGET_SYS}" \
+                    --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
                     --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
 "
 
diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb
index 626a8ef47a..af1d5f53ab 100644
--- a/packages/pwc/pwc_10.0.12-rc1.bb
+++ b/packages/pwc/pwc_10.0.12-rc1.bb
@@ -23,8 +23,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+                         -rpath-link ${STAGING_DIR_TARGET}${layout_libdir}"
 
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
diff --git a/packages/radlib/radlib-mysql.inc b/packages/radlib/radlib-mysql.inc
index a6a5923343..12cb73dcea 100644
--- a/packages/radlib/radlib-mysql.inc
+++ b/packages/radlib/radlib-mysql.inc
@@ -2,5 +2,5 @@ DEPENDS = "mysql"
 
 export CFLAGS_append=" -I${STAGING_INCDIR}/mysql "
 
-EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR} --enable-mysql"
+EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-mysql"
 
diff --git a/packages/radlib/radlib.inc b/packages/radlib/radlib.inc
index 67357ebe55..b8fa555771 100644
--- a/packages/radlib/radlib.inc
+++ b/packages/radlib/radlib.inc
@@ -1 +1 @@
-EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR}"
+EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix}"
diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb
index ae32f204a2..81e406c6e1 100644
--- a/packages/roadster/roadster_cvs.bb
+++ b/packages/roadster/roadster_cvs.bb
@@ -11,7 +11,7 @@ RDEPENDS = "gpsd gtk+ cairo libxml2"
 SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=roadster"
 S = "${WORKDIR}/${PN}"
 
-EXTRA_OECONF = " --with-gpsd=${STAGING_DIR}/${TARGET_SYS} "
+EXTRA_OECONF = " --with-gpsd=${STAGING_DIR_TARGET}${layout_exec_prefix} "
 inherit autotools
 
 CFLAGS += " -I{$STAGING_INCDIR} "
diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb
index a27670da76..c5ed177aa6 100644
--- a/packages/skippy/skippy-xd_0.5.0.bb
+++ b/packages/skippy/skippy-xd_0.5.0.bb
@@ -9,9 +9,9 @@ SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \
            file://fix-makefile.patch;patch=1 \
            file://event_base.patch;patch=1"
 
-EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
-CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11"
-LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11"
+EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR_TARGET}${layout_prefix}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
+CFLAGS_append = " -I${STAGING_INCDIR}/X11"
+LDFLAGS_append = " -L${STAGING_LIBDIR}/X11"
 
 do_install() {
 	oe_runmake 'BINDIR=${D}${bindir}' install
diff --git a/packages/sox/sox-native_13.0.0.bb b/packages/sox/sox-native_13.0.0.bb
index 9b4dd29433..9be032260c 100644
--- a/packages/sox/sox-native_13.0.0.bb
+++ b/packages/sox/sox-native_13.0.0.bb
@@ -9,7 +9,7 @@ do_patch() {
 }
 
 do_stage() {
-	make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install
+	make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR_HOST}${layout_mandir}" includedir="${STAGING_INCDIR}" install
 	rm ${STAGING_BINDIR}/rec
 	ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec
 }