Remove layout_* variables

Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.

This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

57 files changed, 211 insertions, 269 deletions

diff --git a/meta-moblin/packages/boost/boost-36.inc b/meta-moblin/packages/boost/boost-36.inc
index 4bd065f13a..593498206e 100644
--- a/meta-moblin/packages/boost/boost-36.inc
+++ b/meta-moblin/packages/boost/boost-36.inc
@@ -35,7 +35,7 @@ BOOST_LIBS = "\
 # To enable python, uncomment the following:
 #BOOST_LIBS += "python"
 #DEPENDS += "python"
-#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}"
+#PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
 #PYTHON_VERSION = "2.5"
 
 S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index d7fc37566c..8aa035191e 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -206,11 +206,11 @@ autotools_stage_all() {
         oe_runmake DESTDIR="${STAGE_TEMP}" install
         autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
         if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
-                autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir}
-                autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir}
-                autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir}
-                autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir}
-                autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir}
+                autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${bindir}
+                autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${sbindir}
+                autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${base_bindir}
+                autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${base_sbindir}
+                autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${libexecdir}
         fi
         if [ -d ${STAGE_TEMP}/${libdir} ]
         then
@@ -218,7 +218,7 @@ autotools_stage_all() {
         fi
         if [ -d ${STAGE_TEMP}/${base_libdir} ]
         then
-                autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir}
+                autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${base_libdir}
         fi
         rm -rf ${STAGE_TEMP}/${mandir} || true
         rm -rf ${STAGE_TEMP}/${infodir} || true
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0733cddd98..0605c8a0e3 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -926,8 +926,8 @@ base_do_stage () {
         :
 }
 
-do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DIR_TARGET}/${layout_libdir} \
-                             ${STAGING_DIR_TARGET}/${layout_includedir} \
+do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
+                             ${STAGING_DIR_TARGET}/${includedir} \
                              ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
                              ${STAGING_INCDIR_NATIVE} \
                              ${STAGING_DATADIR} \
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 50c66ae8d3..9ebb54887c 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -14,8 +14,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_DIR_HOST}${layout_prefix}:'"
-                s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
+                s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
+                s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
                 s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
                 s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
         return s
@@ -31,7 +31,7 @@ do_install_append() {
                 -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ 
                 -e 's:${STAGING_INCDIR}:${includedir}:g;' \
                 -e 's:${STAGING_DATADIR}:${datadir}:' \
-                -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config`
+                -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' > ${D}${bindir}/`basename $config`
         done
     fi  
 
@@ -40,7 +40,7 @@ do_install_append() {
                     -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
                     -e 's:${STAGING_INCDIR}:${includedir}:g;' \
                     -e 's:${STAGING_DATADIR}:${datadir}:' \
-                    -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \
+                    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
                     $lafile
         done        
 }
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 9dddca127a..1eaee14342 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -26,34 +26,11 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
 TOOLCHAIN_OPTIONS = ""
 
 # Overrides for paths
-
-# Path prefixes
-base_prefix = "${exec_prefix}"
 prefix = "${CROSS_DIR}"
+base_prefix = "${prefix}"
 exec_prefix = "${prefix}"
-
-# Base paths
-base_bindir = "${base_prefix}/bin"
 base_sbindir = "${base_prefix}/bin"
-base_libdir = "${base_prefix}/lib"
-
-# Architecture independent paths
-datadir = "${prefix}/share"
-sysconfdir = "${prefix}/etc"
-sharedstatedir = "${prefix}/com"
-localstatedir = "${prefix}/var"
-infodir = "${datadir}/info"
-mandir = "${datadir}/man"
-docdir = "${datadir}/doc"
-servicedir = "${prefix}/srv"
-
-# Architecture dependent paths
-bindir = "${exec_prefix}/bin"
 sbindir = "${exec_prefix}/bin"
-libexecdir = "${exec_prefix}/libexec"
-libdir = "${exec_prefix}/lib"
-includedir = "${exec_prefix}/include"
-oldincludedir = "${exec_prefix}/include"
 
 do_stage () {
         oe_runmake install
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 2fcf0fd6cb..0b9bdfe1a9 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -2,7 +2,7 @@ inherit distutils-base
 
 DISTUTILS_BUILD_ARGS ?= ""
 DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
-DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \
+DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${prefix} \
     --install-data=${STAGING_DATADIR}"
 DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
     --install-data=${D}/${datadir}"
@@ -16,7 +16,7 @@ distutils_do_compile() {
 }
 
 distutils_stage_headers() {
-        install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
+        install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
@@ -25,10 +25,10 @@ distutils_stage_headers() {
 }
 
 distutils_stage_all() {
-        install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+        install -d ${STAGING_DIR_HOST}${prefix}/${PYTHON_DIR}/site-packages
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
-        PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
+        PYTHONPATH=${STAGING_DIR_HOST}${prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         oefatal "python setup.py install (stage) execution failed."
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index de6b6fff42..5da766426f 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -50,32 +50,15 @@ export RANLIB = "${HOST_PREFIX}ranlib"
 export STRIP = "${HOST_PREFIX}strip"
 
 # Path prefixes
-export base_prefix = "${STAGING_DIR_NATIVE}"
-export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-
-# Base paths
-export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}"
-export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}"
-export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}"
-
-# Architecture independent paths
-export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}"
-export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
-export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}"
-export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}"
-export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}"
-export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}"
-export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}"
-export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}"
-
-# Architecture dependent paths
-export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}"
-export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}"
-export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}"
-export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
-export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
-export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
+base_prefix = "${STAGING_DIR_NATIVE}"
+prefix = "${STAGING_DIR_NATIVE}/usr"
+exec_prefix = "${STAGING_DIR_NATIVE}/usr"
+
+# Since we actually install these into situ there is no staging prefix
+STAGING_DIR_HOST = ""
+STAGING_DIR_TARGET = ""
+SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs"
+PKG_CONFIG_DIR = "${libdir}/pkgconfig"
 
 #
 # If changing this function, please make sure packaged-staging.bbclass is
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 3dad4e8e0e..68aad800a2 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -174,11 +174,11 @@ staging_helper () {
                 done
                 echo "dest root /" >> $conffile
         fi
-        if [ ! -e ${TMPDIR}${layout_libdir}/opkg/info/ ]; then
-                mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/
+        if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then
+                mkdir -p ${TMPDIR}${libdir}/opkg/info/
         fi
-        if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then
-                cd ${TMPDIR}${layout_libdir}/
+        if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then
+                cd ${TMPDIR}${libdir}/
                 ln -sf opkg/ ipkg || true
         fi
 }
@@ -210,7 +210,7 @@ python packagestage_scenefunc () {
         #
         # Install the staging package somewhere temporarily so we can extract the stamp files
         #
-        bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${layout_libdir}/opkg/info/ ", d))
+        bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir}/opkg/info/ ", d))
         cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d)
         ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg))
         if ret != 0:
@@ -379,20 +379,20 @@ staging_packager () {
 staging_package_installer () {
         #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
 
-        STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status
+        STATUSFILE=${TMPDIR}${libdir}/opkg/status
         echo "Package: ${PSTAGE_PKGPN}"        >> $STATUSFILE
         echo "Version: ${PSTAGE_PKGVERSION}"   >> $STATUSFILE
         echo "Status: install user installed"  >> $STATUSFILE
         echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
         echo "" >> $STATUSFILE
 
-        CTRLFILE=${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.control
+        CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control
         echo "Package: ${PSTAGE_PKGPN}"        > $CTRLFILE
         echo "Version: ${PSTAGE_PKGVERSION}"   >> $CTRLFILE
         echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
 
         cd ${PSTAGE_TMPDIR_STAGE}
-        find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.list
+        find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list
 }
 
 staging_package_libtoolhack () {
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index a109333113..97fa8552cf 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -59,7 +59,7 @@ FILES_${PN}-dbg += "${prefix}/.debug \
                     ${prefix}/bin/.debug \
                    "
 
-export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
+export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
 
 python () {
diff --git a/meta/classes/xlibs.bbclass b/meta/classes/xlibs.bbclass
index ae8f928f1e..fc52400b9f 100644
--- a/meta/classes/xlibs.bbclass
+++ b/meta/classes/xlibs.bbclass
@@ -6,10 +6,10 @@ XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs"
 inherit autotools pkgconfig
 
 do_stage() {
-        oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
+        oe_runmake install prefix=${STAGING_DIR_HOST}${prefix} \
                bindir=${STAGING_BINDIR} \
                includedir=${STAGING_INCDIR} \
                libdir=${STAGING_LIBDIR} \
                datadir=${STAGING_DATADIR} \
-                mandir=${STAGING_DIR_HOST}${layout_mandir}
+                mandir=${STAGING_DIR_HOST}${mandir}
 }
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a0e62578ec..f5031f0b01 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -1,65 +1,51 @@
 ##################################################################
-# Standard target filesystem layout.
-##################################################################
-
-# Path prefixes
-layout_prefix = "/usr"
-layout_exec_prefix = "/usr"
-layout_base_prefix = ""
-
-# Base paths
-layout_base_bindir = "${layout_base_prefix}/bin"
-layout_base_sbindir = "${layout_base_prefix}/sbin"
-layout_base_libdir = "${layout_base_prefix}/lib"
-
-# Architecture independent paths
-layout_sysconfdir = "${layout_base_prefix}/etc"
-layout_localstatedir = "${layout_base_prefix}/var"
-layout_servicedir = "${layout_base_prefix}/srv"
-layout_sharedstatedir = "${layout_prefix}/com"
-layout_datadir = "${layout_prefix}/share"
-layout_infodir = "${layout_datadir}/info"
-layout_mandir = "${layout_datadir}/man"
-layout_docdir = "${layout_datadir}/doc"
-
-# Architecture dependent paths
-layout_bindir = "${layout_exec_prefix}/bin"
-layout_sbindir = "${layout_exec_prefix}/sbin"
-layout_libdir = "${layout_exec_prefix}/lib"
-layout_includedir = "${layout_exec_prefix}/include"
-layout_libexecdir = "${layout_exec_prefix}/libexec"
-
-##################################################################
 # Standard target filesystem paths.
 ##################################################################
 
 # Path prefixes
 export base_prefix = ""
-export prefix = "${layout_prefix}"
-export exec_prefix = "${layout_exec_prefix}"
+export prefix = "/usr"
+export exec_prefix = "/usr"
 
 # Base paths
-export base_bindir = "${layout_base_bindir}"
-export base_sbindir = "${layout_base_sbindir}"
-export base_libdir = "${layout_base_libdir}"
+export base_bindir = "${base_prefix}/bin"
+export base_sbindir = "${base_prefix}/sbin"
+export base_libdir = "${base_prefix}/lib"
 
 # Architecture independent paths
-export datadir = "${layout_datadir}"
-export sysconfdir = "${layout_sysconfdir}"
-export sharedstatedir = "${layout_sharedstatedir}"
-export localstatedir = "${layout_localstatedir}"
-export infodir = "${layout_infodir}"
-export mandir = "${layout_mandir}"
-export docdir = "${layout_docdir}"
-export servicedir = "${layout_servicedir}"
+export datadir = "${prefix}/share"
+export sysconfdir = "${base_prefix}/etc"
+export servicedir = "${base_prefix}/srv"
+export sharedstatedir = "${base_prefix}/com"
+export localstatedir = "${base_prefix}/var"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
 
 # Architecture dependent paths
-export bindir = "${layout_bindir}"
-export sbindir = "${layout_sbindir}"
-export libexecdir = "${layout_libexecdir}"
-export libdir = "${layout_libdir}"
-export includedir = "${layout_includedir}"
-export oldincludedir = "${layout_includedir}"
+export bindir = "${exec_prefix}/bin"
+export sbindir = "${exec_prefix}/sbin"
+export libexecdir = "${exec_prefix}/libexec"
+export libdir = "${exec_prefix}/lib"
+export includedir = "${exec_prefix}/include"
+export oldincludedir = "${exec_prefix}/include"
+
+base_bindir_native = "/bin"
+base_sbindir_native = "/sbin"
+sysconfdir_native = "/etc"
+prefix_native = "/usr"
+bindir_native = "${prefix_native}/bin"
+sbindir_native = "${prefix_native}/sbin"
+includedir_native = "${prefix_native}/include"
+libdir_native = "${prefix_native}/lib"
+datadir_native = "${prefix_native}/share"
+bindir_cross = "/bin"
+
+#
+# Cross recipes need to know about the target layout
+# := is used carefully here
+#
+target_datadir := "${datadir}"
 
 ##################################################################
 # Architecture-dependent build variables.
@@ -263,21 +249,21 @@ B = "${S}"
 STAGING_DIR = "${TMPDIR}/staging"
 
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
-STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}"
-STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
-STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
+STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir_cross}/${MULTIMACH_HOST_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
 
 # This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine 
 # specific packages - hack around it for now.
 STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
-STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
-STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
-STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
-STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}"
-STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}"
+STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
+STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
+STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
+STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
+STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
 STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
 STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
 STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
@@ -367,7 +353,7 @@ EXTRA_IMAGEDEPENDS = ""
 
 CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
 CROSS_DATADIR = "${CROSS_DIR}/share"
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:${STAGING_DIR_NATIVE}${layout_base_bindir}:"
+PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
 export PATH
 
 ##################################################################
@@ -418,7 +404,7 @@ export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
 BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
 export TARGET_CPPFLAGS = ""
-#export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+#export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
@@ -439,8 +425,8 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
 
 export LDFLAGS = "${TARGET_LDFLAGS}"
 export TARGET_LDFLAGS = "-Wl,-O1"
-#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
-#                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
+#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
+#                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
 #                         -Wl,-O1"
 
 # Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
@@ -575,7 +561,7 @@ SLOT = "0"
 
 # Other
 
-export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig"
+export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig"
 export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/packages/apr/apr-util_1.3.4.bb
index f2d5470977..12b444976c 100644
--- a/meta/packages/apr/apr-util_1.3.4.bb
+++ b/meta/packages/apr/apr-util_1.3.4.bb
@@ -11,10 +11,10 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
                 --with-dbm=gdbm \
-                --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
+                --with-gdbm=${STAGING_DIR_HOST}${prefix} \
                 --without-sqlite2 \
                 --without-sqlite3 \
-                --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
+                --with-expat=${STAGING_DIR_HOST}${prefix}"
 
 
 inherit autotools_stage lib_package binconfig
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc
index 029e769fc8..1df093bb43 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/packages/claws-mail/claws-mail.inc
@@ -15,7 +15,7 @@ SRC_URI = "\
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 
 #EXTRA_OECONF = "--disable-aspell-test \
-# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} \
+# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \
 # --enable-aspell"
 
 EXTRA_OECONF = "--disable-aspell-test           \
diff --git a/meta/packages/eds/eds-dbus_2.20.0.bb b/meta/packages/eds/eds-dbus_2.20.0.bb
index 76694ce5a6..274086470c 100644
--- a/meta/packages/eds/eds-dbus_2.20.0.bb
+++ b/meta/packages/eds/eds-dbus_2.20.0.bb
@@ -21,7 +21,7 @@ do_configure_append () {
 }
 
 EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
-                --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \
+                --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
                 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
 
 
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 83b875bd43..a4c91412cd 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -23,7 +23,7 @@ do_configure_append () {
 }
 
 EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
-                --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \
+                --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
                 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
 
 
diff --git a/meta/packages/gcc/gcc-configure-cross.inc b/meta/packages/gcc/gcc-configure-cross.inc
index 5befaa8c67..8a47a45bc9 100644
--- a/meta/packages/gcc/gcc-configure-cross.inc
+++ b/meta/packages/gcc/gcc-configure-cross.inc
@@ -2,8 +2,8 @@ require gcc-configure-common.inc
 
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
-                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
+                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \
                       --with-sysroot=${STAGING_DIR_TARGET} \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 
@@ -31,8 +31,8 @@ do_stage_append () {
         rmdir ${CROSS_DIR}/include || :
         
         # Move libssp into staging
-        install -d ${STAGING_DIR_TARGET}${layout_base_libdir}/
-        mv ${CROSS_DIR}/${TARGET_SYS}/lib/libssp* ${STAGING_DIR_TARGET}${layout_base_libdir}/ || true
+        install -d ${STAGING_DIR_TARGET}${target_base_libdir}/
+        mv ${CROSS_DIR}/${TARGET_SYS}/lib/libssp* ${STAGING_DIR_TARGET}${target_base_libdir}/ || true
 
         # We don't really need to keep this around
         # rm -rf ${CROSS_DIR}/share but leave java there
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index ddaa041ee9..c04b93e568 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -4,8 +4,8 @@ require gcc-configure-common.inc
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
-                      --with-gxx-include-dir=${prefix}/${TARGET_SYS}${layout_includedir}/c++/${BINV}/ \
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
+                      --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \
                       --with-sysroot=${prefix}/${TARGET_SYS} \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 
diff --git a/meta/packages/gcc/gcc-configure-target.inc b/meta/packages/gcc/gcc-configure-target.inc
index a3e274522c..44d6136240 100644
--- a/meta/packages/gcc/gcc-configure-target.inc
+++ b/meta/packages/gcc/gcc-configure-target.inc
@@ -1,6 +1,6 @@
 require gcc-configure-common.inc
 
 EXTRA_OECONF_PATHS = " \
-    --with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+    --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
     --with-gxx-include-dir=${includedir}/c++/${BINV}/"
 
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
index 15e5fa62fc..a2c4445578 100644
--- a/meta/packages/gcc/gcc-cross-initial.inc
+++ b/meta/packages/gcc/gcc-cross-initial.inc
@@ -4,7 +4,7 @@ PACKAGES = ""
 
 # This is intended to be a -very- basic config
 # sysroot is needed in case we use libc-initial
-EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
                 --with-newlib \
                 --without-headers \
                 --disable-shared \
diff --git a/meta/packages/gcc/gcc-cross-intermediate.inc b/meta/packages/gcc/gcc-cross-intermediate.inc
index 4fa12886f1..57fa949485 100644
--- a/meta/packages/gcc/gcc-cross-intermediate.inc
+++ b/meta/packages/gcc/gcc-cross-intermediate.inc
@@ -5,7 +5,7 @@ PACKAGES = ""
 
 # This is intended to be a -very- basic config
 # sysroot is needed in case we use libc-initial
-EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
                 --enable-shared \
                 --disable-multilib \
                 --disable-threads \
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 616a5831d0..83f0ec865b 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -7,4 +7,4 @@ require gcc-package-sdk.inc
 
 DEPENDS += "gmp-native mpfr-native"
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb b/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
index 7e3a459ea8..8cca9f8f06 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                 --disable-libgomp --disable-libmudflap \
-                --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+                --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 9562b43fdc..94a95de407 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -11,7 +11,7 @@ DEPENDS += "gmp-sdk mpfr-sdk"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                 --disable-libgomp --disable-libmudflap \
-                --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+                --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
 # to find libmpfr
 export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
index 9562b43fdc..65df556e8c 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
@@ -11,7 +11,7 @@ DEPENDS += "gmp-sdk mpfr-sdk"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                 --disable-libgomp --disable-libmudflap \
-                --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+                --with-mpfr=${STAGING_DIR_NATIVE}${native_prefix}"
 
 # to find libmpfr
 export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/packages/gcc/gcc-cross.inc
index 3fa6f61f0d..3485824b8a 100644
--- a/meta/packages/gcc/gcc-cross.inc
+++ b/meta/packages/gcc/gcc-cross.inc
@@ -5,6 +5,7 @@
 target_libdir := "${libdir}"
 target_includedir := "${includedir}"
 target_base_libdir := "${base_libdir}"
+target_prefix := "${prefix}"
 
 inherit cross
 
diff --git a/meta/packages/gcc/gcc-cross_4.1.2.bb b/meta/packages/gcc/gcc-cross_4.1.2.bb
index c9e3279ffc..d37ca6653c 100644
--- a/meta/packages/gcc/gcc-cross_4.1.2.bb
+++ b/meta/packages/gcc/gcc-cross_4.1.2.bb
@@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 EXTRA_OECONF_append_avr32= "  --disable-libmudflap "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.2.3.bb b/meta/packages/gcc/gcc-cross_4.2.3.bb
index 72f72835c3..22efffa539 100644
--- a/meta/packages/gcc/gcc-cross_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross_4.2.3.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.3.1.bb b/meta/packages/gcc/gcc-cross_4.3.1.bb
index 11e04594fc..84bee6baf3 100644
--- a/meta/packages/gcc/gcc-cross_4.3.1.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.1.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.3.2.bb b/meta/packages/gcc/gcc-cross_4.3.2.bb
index 11e04594fc..84bee6baf3 100644
--- a/meta/packages/gcc/gcc-cross_4.3.2.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.2.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.3.3.bb b/meta/packages/gcc/gcc-cross_4.3.3.bb
index 11e04594fc..84bee6baf3 100644
--- a/meta/packages/gcc/gcc-cross_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.3.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
index 4fde67b006..b00bebc5c0 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
 #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
 CFLAGS = ""
@@ -16,11 +16,11 @@ LDFLAGS = ""
 
 # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
 do_compile_prepend() {
-        ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
-        ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
+        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
+        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
         ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 
         sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
 
 }
 
-ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index 01b5bdacc4..a1581c2aa1 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
 #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
 CFLAGS = ""
@@ -16,11 +16,11 @@ LDFLAGS = ""
 
 # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
 do_compile_prepend() {
-        ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
-        ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
+        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
+        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
         ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 
         sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
 
 }
 
-ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}"
+ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-native.inc b/meta/packages/gcc/gcc-native.inc
index 6fa615ffc7..63b7375e96 100644
--- a/meta/packages/gcc/gcc-native.inc
+++ b/meta/packages/gcc/gcc-native.inc
@@ -5,7 +5,7 @@ PROVIDES = "gcc-native-${PV}"
 inherit native
 
 # This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
                 --with-newlib \
                 --disable-shared \
                 --disable-threads \
diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc
index 21b7631d3e..127e93e9d3 100644
--- a/meta/packages/glibc/glibc-initial.inc
+++ b/meta/packages/glibc/glibc-initial.inc
@@ -12,7 +12,7 @@ do_configure () {
         find ${S} -name "configure" | xargs touch
         ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
                 --without-cvs --disable-sanity-checks \
-                --with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
+                --with-headers=${STAGING_DIR_TARGET}${includedir} \
                 --enable-hacker-mode
         if grep -q GLIBC_2.3 ${S}/ChangeLog; then
                 # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
@@ -32,7 +32,7 @@ do_compile () {
 
 do_stage () {
         oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
-        includedir='${layout_includedir}' prefix='${layout_prefix}' \
+        includedir='${includedir}' prefix='${prefix}' \
         install-bootstrap-headers=yes install-headers
 
         oe_runmake csu/subdir_lib
@@ -46,10 +46,10 @@ do_stage () {
         if [ -e ${B}/bits/stdio_lim.h ]; then
                 cp ${B}/bits/stdio_lim.h  ${STAGING_INCDIR}/bits/
         fi
-        mkdir -p ${STAGING_DIR_TARGET}${layout_libdir}
-        install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir}
+        mkdir -p ${STAGING_DIR_TARGET}${libdir}
+        install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${libdir}
         ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-                -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
+                -o ${STAGING_DIR_TARGET}${libdir}/libc.so
 }
 
 do_install () {
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb
index 6a5e9f37d7..3f184a6b13 100644
--- a/meta/packages/glibc/glibc_2.4.bb
+++ b/meta/packages/glibc/glibc_2.4.bb
@@ -4,7 +4,7 @@ PR = "r13"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
 
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb
index 0cab17f128..5f95280584 100644
--- a/meta/packages/glibc/glibc_2.5.bb
+++ b/meta/packages/glibc/glibc_2.5.bb
@@ -4,7 +4,7 @@ PR = "r8"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
 
diff --git a/meta/packages/glibc/glibc_2.6.1.bb b/meta/packages/glibc/glibc_2.6.1.bb
index f98864276e..3d39e0f748 100644
--- a/meta/packages/glibc/glibc_2.6.1.bb
+++ b/meta/packages/glibc/glibc_2.6.1.bb
@@ -1,4 +1,3 @@
-require glibc.inc
 PR = "r6"
 
 ARM_INSTRUCTION_SET = "arm"
@@ -8,7 +7,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb
index 24b07163e1..ea178366ac 100644
--- a/meta/packages/glibc/glibc_2.9.bb
+++ b/meta/packages/glibc/glibc_2.9.bb
@@ -9,7 +9,7 @@ PR = "r1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb
index c82121f027..d2aa11605b 100644
--- a/meta/packages/glibc/glibc_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb
@@ -6,7 +6,7 @@ PR = "r11"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
 GLIBC_ADDONS ?= "nptl,libidn"
 
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc
index e871ab4181..41d765f133 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/packages/gnutls/gnutls.inc
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
 
 inherit autotools binconfig pkgconfig pkgconfig_stage
 
-EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${layout_prefix} --with-lzo --disable-guile"
+EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile"
 
 do_stage() {
     oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 1238094914..60c545063e 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-                --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
+                --with-expat=${STAGING_DIR_HOST}${prefix} \
                 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
                 --with-hotplug=${sysconfdir}/hotplug.d \
                 --disable-docbook-docs \
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 451f5796cd..67f9add9ab 100644
--- a/meta/packages/libtool/libtool-cross_2.2.6.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.6.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r23"
+PR = "r24"
 PACKAGES = ""
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
 
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
@@ -25,13 +25,13 @@ do_compile () {
 
 do_stage () {
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
-        install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
-        install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
-        install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
-        install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
-        install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/
+        install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
+        install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+        install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+        install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 }
 
 do_install () {
diff --git a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
index 008e580b9b..0017f38cde 100644
--- a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
+++ b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
@@ -38,7 +38,7 @@ do_stage() {
         install -d ${STAGING_LIBDIR}
         cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
 
-        install -d ${STAGING_DIR_TARGET}${layout_base_libdir}
+        install -d ${STAGING_DIR_TARGET}${base_libdir}
         cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
 }
 
diff --git a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
index 879e719fcd..a8f987b7e1 100644
--- a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
+++ b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
@@ -38,7 +38,7 @@ do_stage() {
         install -d ${STAGING_LIBDIR}
         cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
 
-        install -d ${STAGING_DIR_TARGET}${layout_base_libdir}
+        install -d ${STAGING_DIR_TARGET}${base_libdir}
         cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
 }
 
diff --git a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb
index c5dde36e9c..f02128dac6 100644
--- a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb
@@ -39,7 +39,7 @@ do_stage() {
         install -d ${STAGING_LIBDIR}
         cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
 
-        install -d ${STAGING_DIR_TARGET}${layout_base_libdir}
+        install -d ${STAGING_DIR_TARGET}${base_libdir}
         cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
 
         sed -e "s# /lib# ../../lib#g" \
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index acdf29c4a8..2b8666099d 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -25,15 +25,15 @@ do_stage() {
         install -d ${DEPLOY_DIR}/ipk/
         install -d ${STAGING_DIR}/pkgdata/
         install -d ${STAGING_DIR_TARGET}/shlibs/
-        install -d ${STAGING_DIR_TARGET}/${layout_base_libdir}/
-        install -d ${STAGING_DIR_TARGET}/${layout_libdir}/
-        install -d ${STAGING_DIR_TARGET}/${layout_includedir}/
+        install -d ${STAGING_DIR_TARGET}/${base_libdir}/
+        install -d ${STAGING_DIR_TARGET}/${libdir}/
+        install -d ${STAGING_DIR_TARGET}/${includedir}/
 
         cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
         cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
         cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
-        cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${layout_base_libdir}/
-        cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${layout_includedir}/
-        cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${layout_libdir}/
+        cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${base_libdir}/
+        cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${includedir}/
+        cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${libdir}/
 }
 
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 65b802f6b2..91226a9d77 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -24,8 +24,8 @@ do_populate_sdk() {
         rm -rf ${SDK_OUTPUT}
         rm -rf ${SDK_OUTPUT2}
         mkdir -p ${SDK_OUTPUT}
-        mkdir -p ${SDK_OUTPUT}${layout_libdir}/opkg/
-        mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${layout_libdir}/opkg/
+        mkdir -p ${SDK_OUTPUT}${libdir}/opkg/
+        mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${libdir}/opkg/
 
         rm -f ${IPKGCONF_TARGET}
         touch ${IPKGCONF_TARGET}
@@ -49,8 +49,8 @@ do_populate_sdk() {
         mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg/
         rm -Rf ${SDK_OUTPUT}/usr/lib
 
-        install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir}
-        install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir}/
+        install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}
+        install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/
 
         install -d ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}
         install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}/
@@ -87,10 +87,10 @@ do_populate_sdk() {
 
         # Fix or remove broken .la files
         for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do
-                sed -i  -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \
-                        -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \
-                        -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \
-                        -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \
+                sed -i  -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${SDKPATH}/${TARGET_SYS}${base_libdir},g" \
+                        -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${SDKPATH}/${TARGET_SYS}${libdir},g" \
+                        -e "/^dependency_libs=/s,\-\([LR]\)${base_libdir},-\1${SDKPATH}/${TARGET_SYS}${base_libdir},g" \
+                        -e "/^dependency_libs=/s,\-\([LR]\)${libdir},-\1${SDKPATH}/${TARGET_SYS}${libdir},g" \
                         -e 's/^installed=yes$/installed=no/' $i
         done
         rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la
@@ -107,19 +107,19 @@ do_populate_sdk() {
         touch $script
         echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script
         echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script
-        echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script
+        echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${libdir}/pkgconfig' >> $script
         echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script
         echo 'export CC=${TARGET_PREFIX}gcc' >> $script
         echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script
         if [ "${TARGET_OS}" = "darwin8" ]; then
-                echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${layout_includedir}"' >> $script
-                echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${layout_libdir}"' >> $script
+                echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${includedir}"' >> $script
+                echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${libdir}"' >> $script
                 # Workaround darwin toolchain sysroot path problems
                 cd ${SDK_OUTPUT}${SDKPATH}/${TARGET_SYS}/usr
                 ln -s /usr/local local
         fi
         echo "alias opkg='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATH}'" >> $script
-        echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script
+        echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script
 
         # Add version information
         versionfile=${SDK_OUTPUT}/${SDKPATH}/version
diff --git a/meta/packages/meta/staging-linkage_1.0.bb b/meta/packages/meta/staging-linkage_1.0.bb
index 95d82d3273..2a50d1f04e 100644
--- a/meta/packages/meta/staging-linkage_1.0.bb
+++ b/meta/packages/meta/staging-linkage_1.0.bb
@@ -21,9 +21,9 @@ do_install() {
 }
 
 do_stage () {
-        if [ -e ${STAGING_DIR_HOST}${layout_base_libdir} ]; then
-                cp -pPRr ${STAGING_DIR_HOST}${layout_base_libdir}/* ${STAGING_LIBDIR}
-                mv ${STAGING_DIR_HOST}${layout_base_libdir}/ ${STAGING_DIR_HOST}${layout_libdir}-oldbackup
+        if [ -e ${STAGING_DIR_HOST}${base_libdir} ]; then
+                cp -pPRr ${STAGING_DIR_HOST}${base_libdir}/* ${STAGING_LIBDIR}
+                mv ${STAGING_DIR_HOST}${base_libdir}/ ${STAGING_DIR_HOST}${libdir}-oldbackup
         fi
-        ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${layout_base_libdir}
+        ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${base_libdir}
 }
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index 9e6bcd6eee..450313c2e7 100644
--- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -1,7 +1,6 @@
-LICENSE = "GPL"
-require module-init-tools_${PV}.bb
+require module-init-tools.inc
+PR = "r3"
 inherit cross
-DEFAULT_PREFERENCE = "0"
 PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
 
 EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
diff --git a/meta/packages/module-init-tools/module-init-tools.inc b/meta/packages/module-init-tools/module-init-tools.inc
new file mode 100644
index 0000000000..449b9fd455
--- /dev/null
+++ b/meta/packages/module-init-tools/module-init-tools.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
+removing kernel modules for Linux (versions 2.5.48 and above). It serves \
+the same function that the modutils package serves for Linux 2.4."
+LICENSE = "GPL"
+SECTION = "base"
+
+PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod"
+
+FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
+FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
+           file://ignore_arch_directory;patch=1 \
+           file://modutils_extension;patch=1 \
+           file://no_man_rebuild;patch=1 \
+           file://manpagesopt;patch=1 \
+           file://module-init-tools-remove-index.patch;patch=1 "
+S = "${WORKDIR}/module-init-tools-${PV}"
+
+EXTRA_OECONF = "--disable-manpages"
+
+inherit autotools
diff --git a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
index dcf9063219..4977049b8a 100644
--- a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -1,31 +1,9 @@
-DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
-removing kernel modules for Linux (versions 2.5.48 and above). It serves \
-the same function that the modutils package serves for Linux 2.4."
-LICENSE = "GPL"
-SECTION = "base"
+require module-init-tools.inc
 PR = "r3"
 
-PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
-RDEPENDS_${PN} += "module-init-tools-depmod"
-
-FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
-FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-           file://ignore_arch_directory;patch=1 \
-           file://modutils_extension;patch=1 \
-           file://no_man_rebuild;patch=1 \
-           file://manpagesopt;patch=1 \
-           file://module-init-tools-remove-index.patch;patch=1 "
-S = "${WORKDIR}/module-init-tools-${PV}"
-
-EXTRA_OECONF = "--disable-manpages"
-
 bindir = "/bin"
 sbindir = "/sbin"
 
-inherit autotools
-
 do_install() {
         autotools_do_install
         for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index ff862211c3..36aee351bb 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -59,12 +59,12 @@ EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-h
 export LIBXUL_DIST="${S}/dist"
 
 do_stage_append () {
-        autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/
-        autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/
-        ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/bin
-        ln -fs ${STAGING_DIR_HOST}${layout_datadir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/idl
-        ln -fs ${STAGING_DIR_HOST}${layout_includedir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/include
-        ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/lib
+        autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/
+        autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/
+        ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/bin
+        ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/idl
+        ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/include
+        ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/lib
         install -m 755 ${S}/dist/host/bin/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl
 }
 
diff --git a/meta/packages/pax-utils/pax-utils-native_0.1.19.bb b/meta/packages/pax-utils/pax-utils-native_0.1.19.bb
index cf89f803bf..a8db2d8f2a 100644
--- a/meta/packages/pax-utils/pax-utils-native_0.1.19.bb
+++ b/meta/packages/pax-utils/pax-utils-native_0.1.19.bb
@@ -3,5 +3,5 @@ inherit native
 require pax-utils_${PV}.bb
 
 do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
+    oe_runmake PREFIX=${STAGING_DIR_HOST}${prefix} install
 }
diff --git a/meta/packages/python/python-native_2.5.1.bb b/meta/packages/python/python-native_2.5.1.bb
index 4f6a4a84ca..df3d3c899d 100644
--- a/meta/packages/python/python-native_2.5.1.bb
+++ b/meta/packages/python/python-native_2.5.1.bb
@@ -22,9 +22,6 @@ S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools native
 
-prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
-
 EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
                 --without-cxx --with-signal-module --with-wctype-functions"
 EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \
diff --git a/meta/packages/rpm/rpm-native_4.4.2.3.bb b/meta/packages/rpm/rpm-native_4.4.2.3.bb
index 5ed737e366..1545801370 100644
--- a/meta/packages/rpm/rpm-native_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm-native_4.4.2.3.bb
@@ -3,5 +3,4 @@ inherit native
 
 DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
 
-export localstatedir = "${layout_localstatedir}"
-export varprefix = "${layout_localstatedir}"
+export varprefix = "${localstatedir}"
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index bc821bc1a7..d13089501f 100644
--- a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
                 --enable-text-blink --enable-rxvt-scroll \
                 --enable-combining --enable-shared \
                 --enable-xgetdefault \
-                --with-x=${STAGING_DIR_HOST}${layout_prefix}"
+                --with-x=${STAGING_DIR_HOST}${prefix}"
 EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
                 'XLIB=-L${STAGING_LIBDIR} -lX11'"
 
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index 68dcd14ef8..d0afff5f3c 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -66,7 +66,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL
 SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
            file://uClibc.config"
 
-UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
+UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${prefix}"
 
 # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
 # the CFLAGS (for when building the utils).