Remove hardcoded staging layout assumptions

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

1 files changed, 3 insertions, 3 deletions

diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index c07a9911cd..7a18e71c04 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -13,10 +13,10 @@ distutils_stage_headers() {
 }
 
 distutils_stage_all() {
-        install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages
-        PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
+        install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+        PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
         oefatal "python setup.py install (stage) execution failed."
 }