[oe-commits] org.oe.dev distutils.bbclass: Tweak staging variables

[rpurdie commit]

distutils.bbclass: Tweak staging variables

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7225647391e1e28f3ce98aacba8259b4ae7d54c4
ViewMTN: http://monotone.openembedded.org/revision/info/7225647391e1e28f3ce98aacba8259b4ae7d54c4
Files:
1
classes/distutils.bbclass
Diffs:

#
# mt diff -rdff61f6a9b7dc09c7c6f95c51fc23cf231143736 -r7225647391e1e28f3ce98aacba8259b4ae7d54c4
#
# 
# 
# patch "classes/distutils.bbclass"
#  from [d6701363cef5b26ab81a90ffc863f5ea8686cb17]
#    to [49bfc630952f23c8efac7ba9a7aaeafae466b739]
# 
============================================================
--- classes/distutils.bbclass	d6701363cef5b26ab81a90ffc863f5ea8686cb17
+++ classes/distutils.bbclass	49bfc630952f23c8efac7ba9a7aaeafae466b739
@@ -13,16 +13,15 @@ distutils_stage_headers() {
 }
 
 distutils_stage_headers() {
-        install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
+        install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         oefatal "python setup.py install_headers execution failed."
 }
 
 distutils_stage_all() {
-        install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
-        # is this missing a lib below?
-        PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
+        install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
+        PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${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."