base.bbclass: Fix hardcoded staging references

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

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c504f78283539fcbc2ca9d0387bd254843bc4c54..06a49814d23e11931dd0dd8b95e8bab348f61988 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -684,8 +684,8 @@ base_do_stage () {
        :
 }
 
-do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \
-                            ${STAGING_DIR_TARGET}/include \
+do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DIR_TARGET}/${layout_libdir} \
+                            ${STAGING_DIR_TARGET}/${layout_includedir} \
                             ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
                             ${STAGING_INCDIR_NATIVE} \
                             ${STAGING_DATADIR} \