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/package | |
| 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/package')
| -rw-r--r-- | mk/package/bsd.package.mk | 4 | ||||
| -rw-r--r-- | mk/package/package.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 16257ac4daf..4c1530f0c7b 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.package.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: bsd.package.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 binary packages. @@ -22,7 +22,7 @@ _COOKIE.package= ${WRKDIR}/.package_done . if exists(${_COOKIE.package}) package: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) package: install . if defined(SKIP_SILENT) @${DO_NADA} diff --git a/mk/package/package.mk b/mk/package/package.mk index 7098dec3184..e956f751d37 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.14 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: package.mk,v 1.15 2006/07/22 16:31:35 jlam Exp $ ###################################################################### ### package (PUBLIC) @@ -21,7 +21,7 @@ _PACKAGE_TARGETS+= release-package-lock . if exists(${_COOKIE.package}) package: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) package: ${_PACKAGE_TARGETS} . else package: barrier |