diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-09-02 09:46:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-09-02 09:46:59 +0000 |
| commit | 733dc27ecf485a0ec5318534dfbbc9491c08df8f (patch) | |
| tree | 1c29d1cbbede4c9510e1026e2a76f0c5584669bc /meta/classes/distutils-base.bbclass | |
| parent | 5781fe13d65057f4362599fb3d5fa87d5a279ea1 (diff) | |
| download | openembedded-core-733dc27ecf485a0ec5318534dfbbc9491c08df8f.tar.gz openembedded-core-733dc27ecf485a0ec5318534dfbbc9491c08df8f.tar.bz2 openembedded-core-733dc27ecf485a0ec5318534dfbbc9491c08df8f.zip | |
classes/distutils*.bbclass: Merge updates from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2645 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/distutils-base.bbclass')
| -rw-r--r-- | meta/classes/distutils-base.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass index c3f325768d..5150be76b9 100644 --- a/meta/classes/distutils-base.bbclass +++ b/meta/classes/distutils-base.bbclass @@ -5,14 +5,14 @@ RDEPENDS += "python-core" def python_dir(d): import os, bb staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) - if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" - if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" + if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" + if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" PYTHON_DIR = "${@python_dir(d)}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/./*/debug \ + ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug" |