base.bbclass: Clean up staging references

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

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 13c76431c6b47a9839cebd475856c994988dbeee..2196aec631172e4921d97982f01d0890ced105bc 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -684,10 +684,10 @@ base_do_stage () {
        :
 }
 
-do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \
-                            ${STAGING_DIR}/${TARGET_SYS}/include \
-                            ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \
-                            ${STAGING_DIR}/${BUILD_SYS}/include \
+do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \
+                            ${STAGING_DIR_TARGET}/include \
+                            ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
+                            ${STAGING_INCDIR_NATIVE} \
                             ${STAGING_DATADIR} \
                             ${S} ${B}"