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 /sysutils | |
| 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 'sysutils')
| -rw-r--r-- | sysutils/kapm/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/kdf/Makefile | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index c855e3410d5..e3c0ec19980 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/06 21:09:40 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:18 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,7 +16,8 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=${X11BASE}/qt1 MOC=${X11BASE}/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}/qt1 +CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ENV+= MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc +CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 86bde4ad01f..abb50ba14c8 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/04/12 23:55:47 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:19 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -15,12 +15,12 @@ DEPENDS+= kde-1.1.2:../../x11/kde USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+=--datadir=${X11BASE}/share/kde \ - --with-qt-dir=${X11BASE}/qt1 \ + --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=${X11BASE}/qt1 \ - MOC=${X11BASE}/qt1/bin/moc \ + QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ + MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" |