summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-06-14 08:04:02 +0000
committerKoen Kooi <koen@openembedded.org>2007-06-14 08:04:02 +0000
commit7682c0c102e0a7a0e36b7303fc1533d72a2d1407 (patch)
tree9591b51b65c38f6d927e3b1121a80ca6bf0d2af5 /classes
parent84cb2a3a852b40b32e19eb04d967d7dd68e3c2b2 (diff)
parentd0a22057caf834e1960b6a0abf8a807b6d82bac0 (diff)
merge of '545fbb481fb86e841b1362914cceb6638930d7ee'
and 'b3b0a8850deffddd2c3a43b7bc7c142279e70463'
Diffstat (limited to 'classes')
-rw-r--r--classes/distutils-base.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index db006b8c77..993ad7964e 100644
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -7,9 +7,11 @@ def python_dir(d):
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"
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/${SRCNAME}/.debug"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
+FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug \
+ ${libdir}/${PYTHON_DIR}/site-packages/.debug"