From 953b30dcb9f29ef6b2426d0faf6c90c45fb947c8 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Fri, 14 Jul 2000 16:04:19 +0000
Subject: 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).
---
 audio/xamp/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'audio/xamp')

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
-- 
cgit v1.2.3