Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedde...

[openembedded.git] / classes / distutils-base.bbclass

diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index db006b8..2e151de 100644 (file)
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -1,15 +1,5 @@
-EXTRA_OEMAKE = ""
 DEPENDS  += "${@["python-native python", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
 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"
-       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"
+inherit distutils-common-base