diff options
| author |   Roman I Khimov <khimov@altell.ru> | 2010-03-23 15:20:19 +0300 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-03-25 09:28:26 +0300 |
| commit | 658ae76b938a90ac3587909f6b8525559fe57b56 (patch) | |
| tree | 9216406ea230a65552429cb71c190c0e00d04c2d /classes | |
| parent | e0f9409803d6edc14608828967c0c52b5a2d182e (diff) | |
| download | openembedded-658ae76b938a90ac3587909f6b8525559fe57b56.tar.gz | |
use PYTHON_SITEPACKAGES_DIR
Converted most of python site-packages references to PYTHON_SITEPACKAGES_DIR.
Signed-off-by: Roman I Khimov <khimov@altell.ru>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/distutils-common-base.bbclass | 8 | ||||
| -rw-r--r-- | classes/distutils.bbclass | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass index b6dce7e583..f66a5cd571 100644 --- a/classes/distutils-common-base.bbclass +++ b/classes/distutils-common-base.bbclass @@ -12,10 +12,10 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" FILES_${PN}-dev += "\ ${datadir}/pkgconfig \ ${libdir}/pkgconfig \ - ${libdir}/${PYTHON_DIR}/site-packages/*.la \ + ${PYTHON_SITEPACKAGES_DIR}/*.la \ " FILES_${PN}-dbg += "\ - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \ + ${PYTHON_SITEPACKAGES_DIR}/.debug \ + ${PYTHON_SITEPACKAGES_DIR}/*/.debug \ + ${PYTHON_SITEPACKAGES_DIR}/*/*/.debug \ " diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 4d1fc8c6fc..3a0f2c706f 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -16,7 +16,7 @@ distutils_do_compile() { } distutils_stage_headers() { - install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages + install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} 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." @@ -25,18 +25,18 @@ distutils_stage_headers() { distutils_stage_all() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages - PYTHONPATH=${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages \ + install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} + PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ 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." } distutils_do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages + install -d ${D}${PYTHON_SITEPACKAGES_DIR} STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \ + PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ oefatal "python setup.py install execution failed." @@ -57,7 +57,7 @@ distutils_do_install() { done fi - rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth # # FIXME: Bandaid against wrong datadir computation |