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 /x11/kworldwatch | |
| 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 'x11/kworldwatch')
| -rw-r--r-- | x11/kworldwatch/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile index 45c3f7c6c37..57c1f962786 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/04/24 14:14:13 tron Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/10 15:08:21 agc Exp $ # DISTNAME= kworldwatch-0.6 @@ -16,13 +16,13 @@ CONFLICTS+= kdetoys-* USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+=--datadir=${X11BASE}/share/kde \ - --with-qt-dir=${X11BASE}/qt1 \ - --with-qt-libraries='${X11BASE}/qt1/lib -L${LOCALBASE}/lib' \ + --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ + --with-qt-libraries='`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib -L${LOCALBASE}/lib' \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - MOC=${X11BASE}/qt1/bin/moc \ - QTDIR=${X11BASE}/qt1 \ + MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ + QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" |