diff options
| author | drochner <drochner@pkgsrc.org> | 2003-02-18 19:16:53 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2003-02-18 19:16:53 +0000 |
| commit | 842173fdb0f15862d5edd435743267e3d3719e2f (patch) | |
| tree | 67119fb2777e65fb1817791f0ab90ec6e66cff3e /x11/qt3-libs | |
| parent | 4bd7f0e8c7b048cecf894774a53b74bbc3dc3cbf (diff) | |
| download | pkgsrc-842173fdb0f15862d5edd435743267e3d3719e2f.tar.gz | |
Substitute "LIBQT" by something sensible at build time instead of leaving
it an environment variable.
So we get a "qmake.conf" installed which is usable ouside the pkgsrc/qt3*
context.
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/Makefile | 6 | ||||
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 5d7459787db..f71143805ab 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2003/02/04 18:09:16 skrll Exp $ +# $NetBSD: Makefile,v 1.14 2003/02/18 19:16:53 drochner Exp $ # +LIBQT= ${WRKSRC}/lib/libqt-mt.la + .include "../qt3-libs/Makefile.common" PKGNAME= qt3-libs-${QTVERSION} @@ -8,8 +10,6 @@ COMMENT= C++ X GUI toolkit USE_BUILDLINK2= yes -MAKE_ENV+= LIBQT="${WRKSRC}/lib/libqt-mt.la" - ALL_TARGET= sub-plugins PTHREAD_OPTS+= require diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 0151e8002d1..2442417066c 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2003/01/25 13:21:04 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2003/02/18 19:16:53 drochner Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -25,6 +25,7 @@ CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance QTPREFIX= ${PREFIX}/qt3 +LIBQT?= -lqt-mt CONFIGURE_ENV+= QTDIR="${WRKSRC}" MAKE_ENV+= QTPREFIX=${QTPREFIX} @@ -73,6 +74,7 @@ post-patch: -e 's:@SYS_LIBS@:${SYS_LIBS}:g' \ -e 's:@LEX@:${LEX}:g' \ -e 's:@YACC@:${YACC}:g' \ + -e 's:@LIBQT@:${LIBQT}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ ${CP} ${WRKSRC}/qmake.conf $${dir}; \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 0897386be4c..192d658ce7d 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.6 2003/01/07 23:56:54 jlam Exp $ -# $Id: qmake.conf,v 1.6 2003/01/07 23:56:54 jlam Exp $ +# $NetBSD: qmake.conf,v 1.7 2003/02/18 19:16:54 drochner Exp $ +# $Id: qmake.conf,v 1.7 2003/02/18 19:16:54 drochner Exp $ # # qmake configuration for netbsd-g++ # @@ -71,8 +71,8 @@ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ QMAKE_LIBS_X11SM = -lICE -lSM -QMAKE_LIBS_QT = $(LIBQT) -QMAKE_LIBS_QT_THREAD = $(LIBQT) +QMAKE_LIBS_QT = @LIBQT@ +QMAKE_LIBS_QT_THREAD = @LIBQT@ QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu |