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/buildlink3 | |
| 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/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 09dc48363e2..753f2f854c3 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.184 2006/07/10 17:10:18 wiz Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.185 2006/07/22 16:31:35 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -197,7 +197,7 @@ ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} ### ### BEGIN: after the barrier ### -.if exists(${_COOKIE.barrier}) +.if defined(_PKGSRC_BARRIER) # Generate default values for: # |