diff options
| author | agc <agc> | 2000-07-10 15:08:13 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-10 15:08:13 +0000 |
| commit | 759a1da38c400eb5e5378600820b8900fe956a9a (patch) | |
| tree | 4049372601c8df738c9d8100ec5b6c62cb36e7ae /audio | |
| parent | eebfc40e204b2e2ecf7febe64eb4c275ab6ff2c6 (diff) | |
| download | pkgsrc-759a1da38c400eb5e5378600820b8900fe956a9a.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 'audio')
| -rw-r--r-- | audio/kdemultimedia/Makefile | 4 | ||||
| -rw-r--r-- | audio/musicbox/Makefile | 4 | ||||
| -rw-r--r-- | audio/xamp/Makefile | 8 | ||||
| -rw-r--r-- | audio/xsidplay/Makefile | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile index bbe0d45631e..4a104fc64ee 100644 --- a/audio/kdemultimedia/Makefile +++ b/audio/kdemultimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/04/23 15:28:06 kim Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:13 agc Exp $ DISTNAME= kdemultimedia-1.1.2 CATEGORIES= audio kde @@ -15,7 +15,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=${PREFIX}/qt1" + "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index 02755b2b04f..f55c15d58f1 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:20 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:14 agc Exp $ DISTNAME= musicbox-1.01p2 CATEGORIES= audio @@ -14,7 +14,7 @@ USE_X11= yes WRKSRC= ${WRKDIR}/musicbox-1.01 -PATH= ${X11BASE}/qt1/bin:$$PATH +PATH= `${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH do-install: ${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 65e970e5311..29442ea6842 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.4 2000/07/10 15:08:14 agc Exp $ # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp # @@ -19,10 +19,10 @@ CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" USE_GMAKE= yes USE_X11BASE= yes -CONFIGURE_ARGS+= "--with-qt-dir=${X11BASE}/qt1" \ +CONFIGURE_ARGS+= "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" \ -CONFIGURE_ENV+= "QTDIR=${X11BASE}/qt1" -CONFIGURE_ENV+= "MOC=${X11BASE}/qt1/bin/moc" +CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" +CONFIGURE_ENV+= "MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 6729f7ed849..23643a2c21a 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/06/20 21:13:59 pooka Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/10 15:08:14 agc Exp $ # DISTNAME= xsidplay-1_3_9 @@ -20,13 +20,13 @@ USE_GMAKE= yes CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \ --with-sidplay-library=${LOCALBASE}/lib \ - --with-qt-dir=${LOCALBASE}/qt1/lib \ + --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib \ --with-qt-dir=${X11BASE}/qt1 LDFLAGS+= -Wl,-R${LOCALBASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= "MOC=${PREFIX}/qt1/bin/moc" +CONFIGURE_ENV+= "MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc" do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin |