[pkgsrc/trunk]: pkgsrc/mk Move inclusion of bsd.pkg.barrier.mk under the .MAI...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ec10ec70cb1
branches:  trunk
changeset: 515681:4ec10ec70cb1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 06 15:43:10 2006 +0000

description:
Move inclusion of bsd.pkg.barrier.mk under the .MAIN target because
bsd.pkg.barrier.mk uses the "make()" test expression.  Also, include
"all" as a post-barrier target since it is implicitly the ".MAIN" target
when a user just types "make" in a package directory.

diffstat:

 mk/bsd.pkg.barrier.mk |  3 ++-
 mk/bsd.pkg.mk         |  8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 1c93693ce38b -r 4ec10ec70cb1 mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk     Thu Jul 06 15:33:19 2006 +0000
+++ b/mk/bsd.pkg.barrier.mk     Thu Jul 06 15:43:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.2 2006/07/06 15:33:19 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.3 2006/07/06 15:43:10 jlam Exp $
 
 _BARRIER_COOKIE=       ${WRKDIR}/.barrier_cookie
 
@@ -16,6 +16,7 @@
 _BARRIER_POST_TARGETS+=        configure
 _BARRIER_POST_TARGETS+=        build
 _BARRIER_POST_TARGETS+=        test
+_BARRIER_POST_TARGETS+=        all
 _BARRIER_POST_TARGETS+=        install
 _BARRIER_POST_TARGETS+=        reinstall
 _BARRIER_POST_TARGETS+=        package
diff -r 1c93693ce38b -r 4ec10ec70cb1 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jul 06 15:33:19 2006 +0000
+++ b/mk/bsd.pkg.mk     Thu Jul 06 15:43:10 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1860 2006/07/05 23:27:34 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1861 2006/07/06 15:43:10 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -463,9 +463,6 @@
 # Tools
 .include "../../mk/tools/bsd.tools.mk"
 
-# Barrier
-.include "../../mk/bsd.pkg.barrier.mk"
-
 # Unprivileged builds
 .include "../../mk/unprivileged.mk"
 
@@ -514,6 +511,9 @@
 
 .MAIN: all
 
+# Barrier
+.include "../../mk/bsd.pkg.barrier.mk"
+
 ################################################################
 # Many ways to disable a package.
 #