1 files changed, 6 insertions, 6 deletions

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}/
 }