diff options
| author | agc <agc@pkgsrc.org> | 2000-07-11 14:53:35 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-11 14:53:35 +0000 |
| commit | 4aeac45f89e5a02fffd8d4fe20e8af07012ec4cd (patch) | |
| tree | 07c067a284dd27eed2ac53c0ec79e856fd2442d9 /audio | |
| parent | 2892ff05e14ce39877f3b9724d09c369fa16359e (diff) | |
| download | pkgsrc-4aeac45f89e5a02fffd8d4fe20e8af07012ec4cd.tar.gz | |
Make the determination of the pre-req package's installed directory be
a bit more user-friendly.
Introduce a show-{gtk+,imlib,kdebase,qt1,qt2,xpm}-prefix target in
bsd.pkg.mk, and use "${MAKE} show-*-prefix" in package Makefiles.
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 | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile index 4a104fc64ee..258d371816b 100644 --- a/audio/kdemultimedia/Makefile +++ b/audio/kdemultimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:13 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:35 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index f55c15d58f1..1d49a9e363f 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:14 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:36 agc Exp $ DISTNAME= musicbox-1.01p2 CATEGORIES= audio @@ -14,7 +14,7 @@ USE_X11= yes WRKSRC= ${WRKDIR}/musicbox-1.01 -PATH= `${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH +PATH= `${MAKE} show-qt1-prefix`/qt1/bin:$$PATH do-install: ${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 29442ea6842..f6c19c53886 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/10 15:08:14 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:37 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" \ +CONFIGURE_ARGS+= "--with-qt-dir=`${MAKE} show-qt1-prefix`/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_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1" +CONFIGURE_ENV+= "MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index a74173c12e3..5e011eac0de 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/11 09:17:08 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:37 agc Exp $ # DISTNAME= xsidplay-1_3_9 @@ -20,12 +20,12 @@ USE_GMAKE= yes CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \ --with-sidplay-library=${LOCALBASE}/lib \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1/lib -LDFLAGS+= -Wl,-R`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib +LDFLAGS+= -Wl,-R`${MAKE} show-qt1-prefix`/qt1/lib CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= "MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc" +CONFIGURE_ENV+= "MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc" do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin |