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/configure | |
| 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/configure')
| -rw-r--r-- | mk/configure/bsd.configure.mk | 4 | ||||
| -rw-r--r-- | mk/configure/configure.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index ce752d3aefb..aa86290788a 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.configure.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: bsd.configure.mk,v 1.7 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 configuring packages for building. @@ -26,7 +26,7 @@ _COOKIE.configure= ${WRKDIR}/.configure_done . if exists(${_COOKIE.configure}) configure: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) configure: wrapper configure-cookie . else configure: barrier diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index 42d079b17c0..6a9bc89df30 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.7 2006/07/21 14:21:28 jlam Exp $ +# $NetBSD: configure.mk,v 1.8 2006/07/22 16:31:35 jlam Exp $ # # CONFIGURE_SCRIPT is the path to the script to run in order to # configure the software for building. If the path is relative, @@ -49,7 +49,7 @@ _CONFIGURE_TARGETS+= release-configure-lock . if exists(${_COOKIE.configure}) configure: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) configure: ${_CONFIGURE_TARGETS} . else configure: barrier |