diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-05 17:41:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-05 17:41:11 +0000 |
| commit | e3f0f1869fab80b87a12c5819925281415699ee2 (patch) | |
| tree | cb985f3cb407fad54efc46217099126b1955727d /mk/depends | |
| parent | deab97f9bd12ef89e434ec6d19998ca0b57021ae (diff) | |
| download | pkgsrc-e3f0f1869fab80b87a12c5819925281415699ee2.tar.gz | |
Allow overrides of the public targets, e.g. "install", "package", etc.
if PKG_SKIP_REASON or PKG_FAIL_REASON is defined. This commit adds
!target(...) guards around those target definitions to avoid "duplicate
target definition" warnings.
Diffstat (limited to 'mk/depends')
| -rw-r--r-- | mk/depends/bsd.depends.mk | 4 | ||||
| -rw-r--r-- | mk/depends/depends.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index cb5c102bd35..b90290c2d79 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.depends.mk,v 1.2 2006/06/05 17:21:55 jlam Exp $ +# $NetBSD: bsd.depends.mk,v 1.3 2006/06/05 17:41:11 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to dependencies. @@ -37,7 +37,9 @@ DEPENDS_TARGET= reinstall ### .PHONY: depends .if defined(NO_DEPENDS) +. if !target(depends) depends: depends-cookie +. endif .else . include "${PKGSRCDIR}/mk/depends/depends.mk" .endif diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk index caa38a192bf..a43096193e4 100644 --- a/mk/depends/depends.mk +++ b/mk/depends/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.3 2006/06/05 14:11:39 jlam Exp $ +# $NetBSD: depends.mk,v 1.4 2006/06/05 17:41:11 jlam Exp $ ###################################################################### ### depends (PUBLIC) @@ -11,7 +11,9 @@ _DEPENDS_TARGETS+= ${_DEPENDS_COOKIE} _DEPENDS_TARGETS+= release-depends-lock .PHONY: depends +.if !target(depends) depends: ${_DEPENDS_TARGETS} +.endif .PHONY: acquire-depends-lock release-depends-lock acquire-depends-lock: acquire-lock |