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).
---
 sysutils/kdf/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sysutils/kdf')

diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 6b2ae5543c4..3e687b7cfb8 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $
 #
 
 DISTNAME=	kdf-0.5.1
@@ -14,13 +14,13 @@ DEPENDS+=	kde-1.1.2:../../x11/kde
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \
-		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \
+CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
-		MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
 
-- 
cgit v1.2.3