From b00cdbab2a4fdaced9a385b6615983ac745df3c0 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 23 Jan 2006 15:01:39 +0000
Subject: Instead of accumulating _ALL_DEPENDS_PKGSRCDIRS, accumulate
 _ALL_DEPENDS instead -- this keeps more information around.

---
 mk/bsd.utils.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk/bsd.utils.mk')

diff --git a/mk/bsd.utils.mk b/mk/bsd.utils.mk
index c0afb9e692b..37b5e113e57 100644
--- a/mk/bsd.utils.mk
+++ b/mk/bsd.utils.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.utils.mk,v 1.5 2006/01/19 00:40:00 jlam Exp $
+# $NetBSD: bsd.utils.mk,v 1.6 2006/01/23 15:01:39 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines utility
 # and otherwise miscellaneous variables and targets.
@@ -10,11 +10,11 @@
 #
 DEPENDS_TYPE?=  all
 .if !empty(DEPENDS_TYPE:Mbuild) || !empty(DEPENDS_TYPE:Mall)
-_ALL_DEPENDS_PKGSRCDIRS+=	${BUILD_DEPENDS:C/^[^:]*://}
+_ALL_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 .if !empty(DEPENDS_TYPE:Minstall) || !empty(DEPENDS_TYPE:Mpackage) || \
     !empty(DEPENDS_TYPE:Mall)
-_ALL_DEPENDS_PKGSRCDIRS+=	${DEPENDS:C/^[^:]*://}
+_ALL_DEPENDS+=	${DEPENDS}
 .endif
 
 # _PKG_PATHS_CMD canonicalizes package paths so that they're relative to
@@ -27,7 +27,7 @@ _PKG_PATHS_CMD=								\
 
 .PHONY: show-depends-dirs show-depends-pkgpaths
 show-depends-dirs show-depends-pkgpaths:
-	@${_PKG_PATHS_CMD} ${_ALL_DEPENDS_PKGSRCDIRS:O:u}
+	@${_PKG_PATHS_CMD} ${_ALL_DEPENDS:C/^[^:]*://:O:u}
 
 # _DEPENDS_WALK_CMD holds the command (sans arguments) to walk the
 # dependency graph for a package.
-- 
cgit v1.2.3