summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2013-05-09 20:07:39 +0000
committerjoerg <joerg>2013-05-09 20:07:39 +0000
commit3042cbb0fc38c0c0cb274989352661c8af3b155e (patch)
treefe5cf99d71b6f2839aba14736b390967350d7b02
parentac67759e8f9728a4a0a32e2b6fc2c06101681f73 (diff)
downloadpkgsrc-3042cbb0fc38c0c0cb274989352661c8af3b155e.tar.gz
Also override target location and module name. Fix DESTDIR installation.
-rw-r--r--x11/py-qt4-qscintilla/Makefile11
-rw-r--r--x11/py-qt4-qscintilla/PLIST6
2 files changed, 12 insertions, 5 deletions
diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index 0cd72bc0cd8..69194e185fb 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/05/09 14:05:20 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2013/05/09 20:07:39 joerg Exp $
#
DISTNAME= QScintilla-gpl-2.7.1
@@ -19,11 +19,18 @@ USE_LANGUAGES= c++
PY_PATCHPLIST= yes
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+MAKE_FLAGS+= TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
+INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
+
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
--qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
- --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}
+ --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} \
+ --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}
+post-install:
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/Qsci.la \
+ ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4/
.include "../../lang/python/extension.mk"
.include "../../x11/py-sip/buildlink3.mk"
diff --git a/x11/py-qt4-qscintilla/PLIST b/x11/py-qt4-qscintilla/PLIST
index 43dbb5724a8..1c78d5be0a5 100644
--- a/x11/py-qt4-qscintilla/PLIST
+++ b/x11/py-qt4-qscintilla/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2011/05/13 16:39:06 drochner Exp $
-${PYSITELIB}/PyQt4/Qsci.so
-qt4/qsci/api/python/QScintilla2.api
+@comment $NetBSD: PLIST,v 1.3 2013/05/09 20:07:39 joerg Exp $
+${PYSITELIB}/PyQt4/Qsci.la
+qt4/api/python/QScintilla2.api
share/sip${PYVERSSUFFIX}/Qsci/qsciabstractapis.sip
share/sip${PYVERSSUFFIX}/Qsci/qsciapis.sip
share/sip${PYVERSSUFFIX}/Qsci/qscicommand.sip