From f89e3fbb2908901b1b70ddfe632567d1aada7eb5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 17 Jun 2007 12:41:10 +0000
Subject: zope: install python files in /usr/lib/python2.4 instead of
 /usr/lib/python

---
 packages/zope/zope_3.3.1.bb | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'packages/zope')

diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb
index 156de2134f..717e5a119b 100644
--- a/packages/zope/zope_3.3.1.bb
+++ b/packages/zope/zope_3.3.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
 
@@ -18,8 +18,12 @@ do_compile() {
 	oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
 }
 
+PYTHON_MAJMIN = "2.4"
+
 do_install() {
+	install -d ${D}${libdir}/python${PYTHON_MAJMIN}
 	oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
+	mv ${D}${libdir}/python/* ${D}${libdir}/python${PYTHON_MAJMIN} 
 }
 
 PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
@@ -27,15 +31,15 @@ PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
 FILES_${PN} = "${prefix}"
 FILES_${PN}_doc = "${prefix}/doc"
 FILES_${PN}-dbg += "\
-${libdir}/python/BTrees/.debug \
-${libdir}/python/persistent/.debug \
-${libdir}/python/zope/proxy/.debug \
-${libdir}/python/zope/thread/.debug \
-${libdir}/python/zope/security/.debug \
-${libdir}/python/zope/hookable/.debug \
-${libdir}/python/zope/app/container/.debug \
-${libdir}/python/zope/i18nmessageid/.debug \
-${libdir}/python/ZODB/.debug"
-FILES_python-zopeinterface-dbg += "${libdir}/python/zope/interface/.debug "
-
-FILES_python-zopeinterface = "${libdir}/python/zope/interface/*.* ${libdir}/python/zope/interface/common"
+${libdir}/python${PYTHON_MAJMIN}/BTrees/.debug \
+${libdir}/python${PYTHON_MAJMIN}/persistent/.debug \
+${libdir}/python${PYTHON_MAJMIN}/zope/proxy/.debug \
+${libdir}/python${PYTHON_MAJMIN}/zope/thread/.debug \
+${libdir}/python${PYTHON_MAJMIN}/zope/security/.debug \
+${libdir}/python${PYTHON_MAJMIN}/zope/hookable/.debug \
+${libdir}/python${PYTHON_MAJMIN}/zope/app/container/.debug \
+${libdir}/python${PYTHON_MAJMIN}/zope/i18nmessageid/.debug \
+${libdir}/python${PYTHON_MAJMIN}/ZODB/.debug"
+FILES_python-zopeinterface-dbg += "${libdir}/python${PYTHON_MAJMIN}/zope/interface/.debug "
+
+FILES_python-zopeinterface = "${libdir}/python${PYTHON_MAJMIN}/zope/interface/*.* ${libdir}/python${PYTHON_MAJMIN}/zope/interface/common"
-- 
cgit 1.2.3-korg