diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-06-14 07:55:16 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-06-14 07:55:16 +0000 |
| commit | 3b07c3ae41a7b222f7ef3588d0bd8f14b80ef12e (patch) | |
| tree | 433ef64baf6e705ad990660c070b5bd1fe59183c /classes | |
| parent | 7d31b05225e3ba657f656f5c92597915bf8e0631 (diff) | |
| parent | d0a22057caf834e1960b6a0abf8a807b6d82bac0 (diff) | |
merge of '4174da17cc76d0fa9a74373c4588dcabac058e35'
and 'b3b0a8850deffddd2c3a43b7bc7c142279e70463'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/distutils-base.bbclass | 6 |
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" |