The previous method of using a make target for finding a prerequisite

package's prefix would not work as part of the environment specification
via MAKE_ENV (as it would not be executed in the correct directory).

Fix this by invoking pkg_info(1) directly, not via an intermediate make(1)
step - this is not as clean, but more effective (i.e. it works).

4 files changed, 12 insertions, 12 deletions

diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
index 258d371816b..34d955bdc36 100644
--- a/audio/kdemultimedia/Makefile
+++ b/audio/kdemultimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:35 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 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=`${MAKE} show-qt1-prefix`/qt1"
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 1d49a9e363f..8d84b64bbd4 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:36 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -14,7 +14,7 @@ USE_X11=	yes
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
-PATH=	`${MAKE} show-qt1-prefix`/qt1/bin:$$PATH
+PATH=	`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index f6c19c53886..bc6000cfc10 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:37 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:19 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=`${MAKE} show-qt1-prefix`/qt1"
+CONFIGURE_ARGS+=	"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 
-CONFIGURE_ENV+=	"QTDIR=`${MAKE} show-qt1-prefix`/qt1"
-CONFIGURE_ENV+=	"MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc"
+CONFIGURE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+CONFIGURE_ENV+=	"MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc"
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 5e011eac0de..2a05bd1183a 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:37 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:19 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=`${MAKE} show-qt1-prefix`/qt1/lib
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib
 
-LDFLAGS+=	-Wl,-R`${MAKE} show-qt1-prefix`/qt1/lib
+LDFLAGS+=	-Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ENV+=	"MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc"
+CONFIGURE_ENV+=	"MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc"
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin