summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjschauma <jschauma>2006-12-09 19:56:54 +0000
committerjschauma <jschauma>2006-12-09 19:56:54 +0000
commit5424d8727163ad07f9e774e23a6b0af209f9c40e (patch)
tree0d7eb53c17623da534c8bc96657087a3d7ccf5ec /mk
parent3776c0ce1e23adb1835be33cd241100ab9e6fb27 (diff)
downloadpkgsrc-5424d8727163ad07f9e774e23a6b0af209f9c40e.tar.gz
report correct pkgcount by first cd'ing to PKGDB_DIR, then FINDing in there.
(else -prune will cause us to return immediately, always reporting 1 installed package even if we have more)
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index b8d410bc8f8..94f2e1e3e35 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.127 2006/12/09 19:40:53 jschauma Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.128 2006/12/09 19:56:54 jschauma Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -351,7 +351,7 @@ bulk-package:
${ECHO} '###' ; \
${ECHO} '###' `date`: ; \
${ECHO} '### ${MAKE} ${.TARGET} for ${PKGNAME}' ; \
- ${ECHO} '### Current pkg count: ' `${FIND} ${PKG_DBDIR} -type d ! -name '.' -prune -print | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
+ ${ECHO} '### Current pkg count: ' `cd ${PKG_DBDIR} && ${FIND} . -type d ! -name '.' -prune -print | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
${ECHO} '###' ; \
fi \
) 2>&1 | ${TEE} -a ${_BUILDLOG:Q}