diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-22 16:31:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-22 16:31:35 +0000 |
| commit | 704abdbac3bd51676b753d229c461ed0e8e6344d (patch) | |
| tree | b15a0a1dd1ed6c8c5f4175ac698be426219294a6 /mk/patch | |
| parent | 869c5d0bdbac63953a23cb894cdeeb667c68d65b (diff) | |
| download | pkgsrc-704abdbac3bd51676b753d229c461ed0e8e6344d.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/patch')
| -rw-r--r-- | mk/patch/patch.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk index b645ee61538..f7e6572cbb9 100644 --- a/mk/patch/patch.mk +++ b/mk/patch/patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: patch.mk,v 1.10 2006/07/21 14:21:28 jlam Exp $ +# $NetBSD: patch.mk,v 1.11 2006/07/22 16:31:35 jlam Exp $ # # The following variables may be set in a package Makefile and control # how pkgsrc patches are applied. @@ -63,7 +63,7 @@ _PATCH_TARGETS+= release-patch-lock . if exists(${_COOKIE.patch}) patch: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) patch: ${_PATCH_TARGETS} . else patch: barrier |