Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,

which takes entries of the format <make-definition-name>=<pkgname>. This
has not been added to MAKEFLAGS because (a) premature optimisation is the
root of all evil, and (b) because the .for loop used to implement this
shows the wrong results when multiple prefices are evaluated.

Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying
them considerably.

ALso simplify the logic to calculate the prefix as well.

6 files changed, 28 insertions, 17 deletions

diff --git a/games/amor/Makefile b/games/amor/Makefile
index 3af880869cc..25a8cae420a 100644
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:17 agc Exp $
 #
 
 DISTNAME=	amor-0.6
@@ -13,7 +13,9 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
-CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+
+EVAL_PREFIX+=	QT1DIR=qt1
+CONFIGURE_ENV+=	QTDIR=${QT1DIR}/qt1
+CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index eece64e67ce..e66e8b53b71 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:21 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:17 agc Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -11,9 +11,11 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`
+
+EVAL_PREFIX+=	GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix=${GTKDIR}
 CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=	GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config"
+CONFIGURE_ENV+=	GTK_CONFIG="${GTKDIR}/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 18eb093e268..eae82451483 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:21 agc Exp $
+# $NetBSD: Makefile,v 1.40 2000/07/15 20:39:18 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
 #
 
@@ -17,8 +17,10 @@ DEPENDS+=	qwspritefield-1.6:../../x11/qwspritefield
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
+		"--with-qt-dir=${QT1DIR}/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile
index 994cace7e86..4a7d10fa4a5 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:18 agc Exp $
 
 DISTNAME=	kdetoys-1.1.2
 CATEGORIES=	games kde
@@ -16,11 +16,13 @@ CONFLICTS=	kworldwatch-*
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+		"--with-qt-dir=${QT1DIR}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		QTDIR=${QT1DIR}/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 c672d483983..91dcb849592 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:22 agc Exp $
+# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:18 agc Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -21,8 +21,10 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
-PATH=   		`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2/bin:$$PATH
-MAKE_ENV+=		GTYPE=-qt QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
+
+EVAL_PREFIX+=		QT2DIR=qt2
+PATH=   		${QT2DIR}/qt2/bin:$$PATH
+MAKE_ENV+=		GTYPE=-qt QTDIR=${QT2DIR}/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 b74fd53630c..3bf1dc6d51c 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:22 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:19 agc Exp $
 #
 
 DISTNAME=	xarchon-0.50
@@ -14,8 +14,9 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	esound-*:../../audio/esound
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-xpm-prefix=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}` \
-		--with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}` \
+EVAL_PREFIX+=	GTKDIR=gtk+ XPMDIR=xpm
+CONFIGURE_ARGS+=--with-xpm-prefix=${XPMDIR} \
+		--with-gtk-prefix=${GTKDIR} \
 		--with-esd-prefix=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"