summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>1999-11-30 04:17:58 +0000
committerhubertf <hubertf>1999-11-30 04:17:58 +0000
commitae17abf375013421cb1ba985d2627f33a9c55b24 (patch)
tree6e60bc82ceb907f4f28d5fa4fcd6b9f441a4a6e7 /mk
parent38bf3592f17a96e9b0f46191ce343958789cb321 (diff)
downloadpkgsrc-ae17abf375013421cb1ba985d2627f33a9c55b24.tar.gz
DTRT in package-depends if RUN_DEPENDS and PACKAGE_DEPENDS_WITH_PATTERNS
are set.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 97910c0b8af..c7ec8b2956f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.373 1999/11/29 19:48:15 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.374 1999/11/30 04:17:58 hubertf Exp $
#
# This file is in the public domain.
#
@@ -2045,7 +2045,11 @@ package-depends:
@pkg="`${ECHO} \"${dep}\" | ${SED} -e 's/:.*//'`"; \
dir="`${ECHO} \"${dep}\" | ${SED} -e 's/[^:]*://'`"; \
if [ -d $$dir ]; then \
- (cd $$dir && ${MAKE} package-name PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \
+ if ${PACKAGE_DEPENDS_WITH_PATTERNS}; then \
+ ${ECHO} "$$pkg"; \
+ else \
+ (cd $$dir && ${MAKE} package-name PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \
+ fi; \
(cd $$dir && ${MAKE} package-depends PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \
else \
${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \