diff options
| author | jlam <jlam> | 2006-07-22 16:31:35 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-22 16:31:35 +0000 |
| commit | a722f992144dec821dd4a51c1bc918e4ef3a89db (patch) | |
| tree | b15a0a1dd1ed6c8c5f4175ac698be426219294a6 /mk/wrapper | |
| parent | 9d32ffd5dae1a746b256cf4268b59970de5fabc1 (diff) | |
| download | pkgsrc-a722f992144dec821dd4a51c1bc918e4ef3a89db.tar.gz | |
Modify the barrier so that we always invoke the recursive make process
when passing through the barrier. This ensures the PATH (passed via
PKGSRC_MAKE_ENV) is correctly set for all phases after the barrier.
This fixes a bug in "interactive" pkgsrc use, where if you have no
work directory and type "make build && make install", then the "install"
step does not have a PATH set to include all the wrapper and tools
directories.
Diffstat (limited to 'mk/wrapper')
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 42b90cc00e0..ba89a8f75b5 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.49 2006/07/21 14:21:28 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.50 2006/07/22 16:31:35 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -780,7 +780,7 @@ _COOKIE.wrapper= ${WRKDIR}/.wrapper_done . if exists(${_COOKIE.wrapper}) wrapper: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) wrapper: check-vulnerable tools acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock . else wrapper: barrier |