diff options
Diffstat (limited to 'meta/classes/distutils.bbclass')
-rw-r--r-- | meta/classes/distutils.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 857572d759..e5abdd1216 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass | |||
@@ -50,7 +50,7 @@ distutils_do_install() { | |||
50 | done | 50 | done |
51 | fi | 51 | fi |
52 | 52 | ||
53 | if test -e ${D}${sbindir}; then | 53 | if [ -e ${D}${sbindir} ]; then |
54 | for i in ${D}${sbindir}/* ; do \ | 54 | for i in ${D}${sbindir}/* ; do \ |
55 | if [ ${PN} != "${BPN}-native" ]; then | 55 | if [ ${PN} != "${BPN}-native" ]; then |
56 | sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i | 56 | sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i |
@@ -65,13 +65,13 @@ distutils_do_install() { | |||
65 | # | 65 | # |
66 | # FIXME: Bandaid against wrong datadir computation | 66 | # FIXME: Bandaid against wrong datadir computation |
67 | # | 67 | # |
68 | if test -e ${D}${datadir}/share; then | 68 | if [ -e ${D}${datadir}/share ]; then |
69 | mv -f ${D}${datadir}/share/* ${D}${datadir}/ | 69 | mv -f ${D}${datadir}/share/* ${D}${datadir}/ |
70 | rmdir ${D}${datadir}/share | 70 | rmdir ${D}${datadir}/share |
71 | fi | 71 | fi |
72 | 72 | ||
73 | # Fix backport modules | 73 | # Fix backport modules |
74 | if test -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py && test -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py; then | 74 | if [ -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py ] && [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py ]; then |
75 | rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py; | 75 | rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py; |
76 | rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.pyc; | 76 | rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.pyc; |
77 | fi | 77 | fi |