classes/distutils*.bbclass: Merge updates from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2645 311d38ba-8fff-0310-9ca6-ca027cbcb966

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"