diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-16 00:00:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-16 00:00:35 +0000 |
| commit | 71215ccade6cc896a640723eac0bc60bed8a76ff (patch) | |
| tree | f67b3e1d05c482ff6c2c6535b6a198a119b932d9 | |
| parent | 407eac5f7f546009121b311c9fbc6de44b8dc272 (diff) | |
| download | pkgsrc-71215ccade6cc896a640723eac0bc60bed8a76ff.tar.gz | |
Consolidate the bits that add to PKGSRC_USE_TOOLS, and improve the
comment for shlock.
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ab23f2fbc5d..b603737a9c2 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1655 2005/05/15 21:32:42 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1656 2005/05/16 00:00:35 jlam Exp $ # # This file is in the public domain. # @@ -841,6 +841,13 @@ PKGSRC_USE_TOOLS+= \ PKGSRC_USE_TOOLS+= mail .endif +# We need shlock if we're using locking to synchronize multiple builds +# over the same pkgsrc tree. +# +.if ${PKGSRC_LOCKTYPE} != "none" +PKGSRC_USE_TOOLS+= shlock +.endif + # If MANZ is defined, then we want the final man pages to be compressed. # If MANZ is not defined, then we want the final man pages to be # uncompressed. @@ -883,11 +890,6 @@ PKGSRC_USE_TOOLS+= gzip # Patch .include "../../mk/bsd.pkg.patch.mk" -# this must come before tools/bsd.tools.mk is included -.if ${PKGSRC_LOCKTYPE} != "none" -PKGSRC_USE_TOOLS+= shlock -.endif - .if !empty(_USE_NEW_TOOLS:M[yY][eE][sS]) .include "../../mk/tools/bsd.tools.mk" .else |