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 /net | |
| 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 'net')
| -rw-r--r-- | net/kdenetwork/Makefile | 4 | ||||
| -rw-r--r-- | net/kmap/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index c0793fe36ab..a74c8c6db29 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2000/06/13 10:40:27 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2000/07/10 15:08:18 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -24,7 +24,7 @@ USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=${X11BASE}/qt1" + "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" CONFIGURE_ENV= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ diff --git a/net/kmap/Makefile b/net/kmap/Makefile index 643c91962eb..bdfdbb24e98 100644 --- a/net/kmap/Makefile +++ b/net/kmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/04/12 23:09:37 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.3 2000/07/10 15:08:18 agc Exp $ # DISTNAME= kmap-0.5.6 @@ -13,8 +13,8 @@ DEPENDS+= nmap-2.12:../../net/nmap USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=${X11BASE}/qt1 -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}/qt1 +CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 post-patch: cd ${WRKSRC}/kmap ; \ |