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 | 77b719dae84890b82a5725e63447bd357afcf808 (patch) | |
| tree | b15a0a1dd1ed6c8c5f4175ac698be426219294a6 /mk/install | |
| parent | 69a0463807c5ebff6fd2219259abb9595037b127 (diff) | |
| download | pkgsrc-77b719dae84890b82a5725e63447bd357afcf808.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/install')
| -rw-r--r-- | mk/install/bsd.install.mk | 4 | ||||
| -rw-r--r-- | mk/install/install.mk | 4 | ||||
| -rw-r--r-- | mk/install/replace.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index 1b9e5172cb4..23b39f2a28d 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.8 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: bsd.install.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -26,7 +26,7 @@ _COOKIE.install= ${WRKDIR}/.install_done . if exists(${_COOKIE.install}) install: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) install: ${_PKGSRC_BUILD_TARGETS} install-cookie . else install: barrier diff --git a/mk/install/install.mk b/mk/install/install.mk index ee97069fff5..d3dfbe90c2b 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.13 2006/07/20 14:17:48 jlam Exp $ +# $NetBSD: install.mk,v 1.14 2006/07/22 16:31:35 jlam Exp $ ###################################################################### ### install (PUBLIC) @@ -17,7 +17,7 @@ _INSTALL_TARGETS+= release-install-lock . if exists(${_COOKIE.install}) install: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) install: ${_INSTALL_TARGETS} . else install: barrier diff --git a/mk/install/replace.mk b/mk/install/replace.mk index d2ed28f9f38..4053a70fac3 100644 --- a/mk/install/replace.mk +++ b/mk/install/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: replace.mk,v 1.7 2006/07/22 16:31:35 jlam Exp $ ###################################################################### ### replace (PUBLIC) @@ -12,7 +12,7 @@ _REPLACE_TARGETS+= unprivileged-install-hook .PHONY: replace su-replace .if !target(replace) -. if exists(${_COOKIE.barrier}) +. if defined(_PKGSRC_BARRIER) replace: ${_REPLACE_TARGETS} su-target . else replace: barrier |