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/build | |
| 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/build')
| -rw-r--r-- | mk/build/bsd.build.mk | 4 | ||||
| -rw-r--r-- | mk/build/build.mk | 4 | ||||
| -rw-r--r-- | mk/build/test.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk index 7942c347faa..bed06cad624 100644 --- a/mk/build/bsd.build.mk +++ b/mk/build/bsd.build.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.build.mk,v 1.7 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: bsd.build.mk,v 1.8 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 building sources for a package. @@ -28,7 +28,7 @@ _COOKIE.test= ${WRKDIR}/.test_done . if exists(${_COOKIE.build}) build: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) build: configure build-cookie pkginstall . else build: barrier diff --git a/mk/build/build.mk b/mk/build/build.mk index ebab48b20fa..917d26a70bc 100644 --- a/mk/build/build.mk +++ b/mk/build/build.mk @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: build.mk,v 1.5 2006/07/22 16:31:35 jlam Exp $ # # BUILD_MAKE_FLAGS is the list of arguments that is passed to the make # process. @@ -26,7 +26,7 @@ _BUILD_TARGETS+= pkginstall . if exists(${_COOKIE.build}) build: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) build: ${_BUILD_TARGETS} . else build: barrier diff --git a/mk/build/test.mk b/mk/build/test.mk index d0476e9b7d5..66321409854 100644 --- a/mk/build/test.mk +++ b/mk/build/test.mk @@ -1,4 +1,4 @@ -# $NetBSD: test.mk,v 1.5 2006/07/07 21:24:28 jlam Exp $ +# $NetBSD: test.mk,v 1.6 2006/07/22 16:31:35 jlam Exp $ # # TEST_DIRS is the list of directories in which to perform the build # process. If the directories are relative paths, then they @@ -30,7 +30,7 @@ _TEST_TARGETS+= release-test-lock . if exists(${_COOKIE.test}) test: @${DO_NADA} -. elif exists(${_COOKIE.barrier}) +. elif defined(_PKGSRC_BARRIER) test: ${_TEST_TARGETS} . else test: barrier |