diff options
| author | agc <agc@pkgsrc.org> | 2000-07-10 15:08:13 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-10 15:08:13 +0000 |
| commit | 52c1afc38c6c1387969433578010efd90e8e3278 (patch) | |
| tree | 4049372601c8df738c9d8100ec5b6c62cb36e7ae /devel | |
| parent | 866589729134fb595c91494e044fcc17ed5d0867 (diff) | |
| download | pkgsrc-52c1afc38c6c1387969433578010efd90e8e3278.tar.gz | |
Find qt1 prefix via pkg_info(1), rather than hardcoding it as ${X11BASE}.
Pointed out by Dave Sainty <dave@dtsp.co.nz>, munged slightly by me.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cervisia/Makefile | 8 | ||||
| -rw-r--r-- | devel/kdbg/Makefile | 6 | ||||
| -rw-r--r-- | devel/kdevelop/Makefile | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index aa95f82df76..eca198a13c7 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/04/12 21:54:04 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:15 agc Exp $ # DISTNAME= cervisia-0.5.0 @@ -14,9 +14,9 @@ DEPENDS+= cvs-1.10:../../devel/cvs USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= "QTDIR=${X11BASE}/qt1" -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/qt1/include \ - --with-qt-libraries=${X11BASE}/qt1/lib \ +CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" +CONFIGURE_ARGS+=--with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \ + --with-qt-libraries=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib \ --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index 5ccf9836297..bcc339301c2 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/06/01 11:23:21 rh Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/10 15:08:16 agc Exp $ DISTNAME= kdbg-1.0.1 CATEGORIES= devel kde @@ -18,8 +18,8 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt-dir=${PREFIX}/qt1 \ - --with-qt-includes=${PREFIX}/qt1/include \ +CONFIGURE_ARGS= --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ + --with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 84e6a3e19de..692b53e57a1 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:21 rh Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/10 15:08:16 agc Exp $ DISTNAME= kdevelop-1.2 CATEGORIES= devel kde @@ -22,9 +22,9 @@ USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib \ - --with-qt-dir=${X11BASE}/qt1 + --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=${X11BASE}/qt1" +CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" .include "../../mk/bsd.pkg.mk" |