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).

6 files changed, 17 insertions, 17 deletions

diff --git a/games/amor/Makefile b/games/amor/Makefile
index a985a96ca26..3af880869cc 100644
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:39 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $
 #
 
 DISTNAME=	amor-0.6
@@ -13,7 +13,7 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
-CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
+CONFIGURE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 778d685f908..eece64e67ce 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:21 agc Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -11,9 +11,9 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=`${MAKE} show-gtk+-prefix`
+CONFIGURE_ARGS+=	--with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`
 CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=	GTK_CONFIG="`${MAKE} show-gtk+-prefix`/bin/gtk-config"
+CONFIGURE_ENV+=	GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config"
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index 5c02eb85368..18eb093e268 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2000/07/11 14:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
 #
 
@@ -18,7 +18,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/games/kdetoys/Makefile b/games/kdetoys/Makefile
index 6bb35579958..994cace7e86 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $
 
 DISTNAME=	kdetoys-1.1.2
 CATEGORIES=	games kde
@@ -17,10 +17,10 @@ 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} \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
 
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 486c2427865..c672d483983 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:22 agc Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -21,8 +21,8 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
-PATH=   		`${MAKE} show-qt2-prefix`/qt2/bin:$$PATH
-MAKE_ENV+=		GTYPE=-qt QTDIR=`${MAKE} show-qt2-prefix`/qt2
+PATH=   		`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2/bin:$$PATH
+MAKE_ENV+=		GTYPE=-qt QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
 
 PATCHFILES+=		${PKGSRCDIR}/games/nethack-lib/patches/patch-*
 ALLFILES=		${DISTFILES}	# don't checksum shared patches
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index d6e1610d13c..b74fd53630c 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:22 agc Exp $
 #
 
 DISTNAME=	xarchon-0.50
@@ -14,8 +14,8 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	esound-*:../../audio/esound
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-xpm-prefix=`${MAKE} show-xpm-prefix` \
-		--with-gtk-prefix=`${MAKE} show-gtk+-prefix` \
+CONFIGURE_ARGS+=--with-xpm-prefix=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}` \
+		--with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}` \
 		--with-esd-prefix=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"