diff options
| author | jlam <jlam> | 2006-07-06 16:58:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-06 16:58:17 +0000 |
| commit | e27f0393e967d754302f14e3c2ee9adf9db13b1b (patch) | |
| tree | 447e7b4e49d19da668b46f733434c7167a738b98 /mk | |
| parent | fc6d5858711c4598e813bc2c5ff04dbea8ad50b6 (diff) | |
| download | pkgsrc-e27f0393e967d754302f14e3c2ee9adf9db13b1b.tar.gz | |
Fix previous... instead of moving bsd.pkg.barrier.mk down below .MAIN,
move .MAIN all the way to the top of the file. bsd.pkg.barrier.mk
(currently) needs to be included before bsd.wrapper.mk since it defines
_BARRIER_COOKIE, which is expanded and used in place within bsd.wrapper.mk.
This makes the "wrapper" phase run again.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index bc3df09e4b3..93909796f45 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1861 2006/07/06 15:43:10 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1862 2006/07/06 16:58:17 jlam Exp $ # # This file is in the public domain. # @@ -18,6 +18,8 @@ # Include any preferences, if not already included, and common definitions ############################################################################ +.MAIN: all + .include "../../mk/bsd.prefs.mk" .include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk" @@ -463,6 +465,9 @@ USE_TOOLS+= shlock sleep # Tools .include "../../mk/tools/bsd.tools.mk" +# Barrier +.include "../../mk/bsd.pkg.barrier.mk" + # Unprivileged builds .include "../../mk/unprivileged.mk" @@ -509,11 +514,6 @@ _PATH_CMD= \ PATH= ${_PATH_CMD:sh} # DOES NOT use :=, to defer evaluation .endif -.MAIN: all - -# Barrier -.include "../../mk/bsd.pkg.barrier.mk" - ################################################################ # Many ways to disable a package. # |