diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-02-09 00:06:49 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-02-09 00:06:49 +0000 |
| commit | fb2fa1075ab82a84ead46c6d400755297bcc39f4 (patch) | |
| tree | f6ba21a051cbbe8ad887fbb2d63912af54f47c15 /packages/python/python-pyqwt_3.10.bb | |
| parent | 27a7aaf082334bd9cb47ddf06df4746d3133e1e6 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/09 01:04:39+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/09 01:04:15+01:00 uni-frankfurt.de!mickeyl
remove direct references to python2.3, instead compute PYTHON_DIR in distutils. Split distutils into distutils-base and distutils.
BKrev: 42095419HYtcbp33LQCUNFdiLMXHog
Diffstat (limited to 'packages/python/python-pyqwt_3.10.bb')
| -rw-r--r-- | packages/python/python-pyqwt_3.10.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index 1f41ab0459..cf8543f6c8 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \ TARGET=qwt DESTDIR= VERSION=1.0.0 \ DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \ INCLUDEPATH+=../numpy \ - INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \ + LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \ LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " do_generate_prepend() { @@ -49,16 +49,16 @@ do_stage() { for module in ${SIP_MODULES} do install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so done } do_install() { - install -d ${D}/${libdir}/python2.3/site-packages/ + install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/ for module in ${SIP_MODULES} do - install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so + install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so done } -FILES_${PN} = "/usr/lib/python2.3/site-packages" +FILES_${PN} = "/usr/lib/${PYTHON_DIR}/site-packages" |