diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-06 15:43:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-06 15:43:10 +0000 |
| commit | 081adfbfaa774ad5be473a87b4def3b0dc27f5c2 (patch) | |
| tree | c0646986c652aa9ca27079e9f01603cfd7436c66 /mk | |
| parent | e7f6bcd4df210c6d3af2e78315cac54f3713a306 (diff) | |
| download | pkgsrc-081adfbfaa774ad5be473a87b4def3b0dc27f5c2.tar.gz | |
Move inclusion of bsd.pkg.barrier.mk under the .MAIN target because
bsd.pkg.barrier.mk uses the "make()" test expression. Also, include
"all" as a post-barrier target since it is implicitly the ".MAIN" target
when a user just types "make" in a package directory.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.barrier.mk | 3 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index dfceee3d252..dfb4528c75d 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.barrier.mk,v 1.2 2006/07/06 15:33:19 jlam Exp $ +# $NetBSD: bsd.pkg.barrier.mk,v 1.3 2006/07/06 15:43:10 jlam Exp $ _BARRIER_COOKIE= ${WRKDIR}/.barrier_cookie @@ -16,6 +16,7 @@ _BARRIER_POST_TARGETS= wrapper _BARRIER_POST_TARGETS+= configure _BARRIER_POST_TARGETS+= build _BARRIER_POST_TARGETS+= test +_BARRIER_POST_TARGETS+= all _BARRIER_POST_TARGETS+= install _BARRIER_POST_TARGETS+= reinstall _BARRIER_POST_TARGETS+= package diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ce9a981da3e..bc3df09e4b3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1860 2006/07/05 23:27:34 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1861 2006/07/06 15:43:10 jlam Exp $ # # This file is in the public domain. # @@ -463,9 +463,6 @@ USE_TOOLS+= shlock sleep # Tools .include "../../mk/tools/bsd.tools.mk" -# Barrier -.include "../../mk/bsd.pkg.barrier.mk" - # Unprivileged builds .include "../../mk/unprivileged.mk" @@ -514,6 +511,9 @@ PATH= ${_PATH_CMD:sh} # DOES NOT use :=, to defer evaluation .MAIN: all +# Barrier +.include "../../mk/bsd.pkg.barrier.mk" + ################################################################ # Many ways to disable a package. # |