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.

4 files changed, 17 insertions, 12 deletions

diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
index 34d955bdc36..03b6bd23edd 100644
--- a/audio/kdemultimedia/Makefile
+++ b/audio/kdemultimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:13 agc Exp $
 
 DISTNAME=	kdemultimedia-1.1.2
 CATEGORIES=	audio kde
@@ -14,8 +14,10 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 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/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 8d84b64bbd4..109494d807c 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:14 agc Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -14,7 +14,8 @@ USE_X11=	yes
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
-PATH=	`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
+EVAL_PREFIX+=	QT1DIR=qt1
+PATH=		${QT1DIR}/qt1/bin:$$PATH
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index bc6000cfc10..19058468385 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:19 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/15 20:39:15 agc Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -19,10 +19,11 @@ CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
-CONFIGURE_ARGS+=	"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+EVAL_PREFIX+=	QT1DIR=qt1
+CONFIGURE_ARGS+=	"--with-qt-dir=${QT1DIR}/qt1"
 
-CONFIGURE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
-CONFIGURE_ENV+=	"MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc"
+CONFIGURE_ENV+=	"QTDIR=${QT1DIR}/qt1"
+CONFIGURE_ENV+=	"MOC=${QT1DIR}/qt1/bin/moc"
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 2a05bd1183a..702238087d1 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:19 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:15 agc Exp $
 #
 
 DISTNAME=	xsidplay-1_3_9
@@ -18,14 +18,15 @@ USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
 		--with-sidplay-library=${LOCALBASE}/lib \
-		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib
+		--with-qt-dir=${QT1DIR}/qt1/lib
 
-LDFLAGS+=	-Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib
+LDFLAGS+=	-Wl,-R${QT1DIR}/qt1/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ENV+=	"MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc"
+CONFIGURE_ENV+=	"MOC=${QT1DIR}/qt1/bin/moc"
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin