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/extract | |
| 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/extract')
| -rw-r--r-- | mk/extract/extract.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index c1bdb852596..aeeb75974ea 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.12 2006/07/21 14:21:28 jlam Exp $ +# $NetBSD: extract.mk,v 1.13 2006/07/22 16:31:35 jlam Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -53,7 +53,7 @@ _EXTRACT_TARGETS+= release-extract-lock . if exists(${_COOKIE.extract}) extract: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) extract: ${_EXTRACT_TARGETS} . else extract: barrier |