From owner-svn-src-projects@FreeBSD.ORG  Sat Oct 12 23:44:51 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8BF9B43D;
 Sat, 12 Oct 2013 23:44:51 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 79BE926C4;
 Sat, 12 Oct 2013 23:44:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNipH5044383;
 Sat, 12 Oct 2013 23:44:51 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNipVE044381;
 Sat, 12 Oct 2013 23:44:51 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201310122344.r9CNipVE044381@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 12 Oct 2013 23:44:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r256407 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 23:44:51 -0000

Author: sjg
Date: Sat Oct 12 23:44:50 2013
New Revision: 256407
URL: http://svnweb.freebsd.org/changeset/base/256407

Log:
  Sync-up with what's being use in Juniper for building ATF in meta mode.

Modified:
  projects/bmake/share/mk/bsd.own.mk
  projects/bmake/share/mk/bsd.test.mk

Modified: projects/bmake/share/mk/bsd.own.mk
==============================================================================
--- projects/bmake/share/mk/bsd.own.mk	Sat Oct 12 23:42:55 2013	(r256406)
+++ projects/bmake/share/mk/bsd.own.mk	Sat Oct 12 23:44:50 2013	(r256407)
@@ -192,6 +192,9 @@ NLSMODE?=	${NOBINMODE}
 
 INCLUDEDIR?=	/usr/include
 
+TESTSBASE?=	/usr/tests
+TESTSDIR?=	${TESTSBASE}/${RELDIR:S,/tests,,}
+
 #
 # install(1) parameters.
 #

Modified: projects/bmake/share/mk/bsd.test.mk
==============================================================================
--- projects/bmake/share/mk/bsd.test.mk	Sat Oct 12 23:42:55 2013	(r256406)
+++ projects/bmake/share/mk/bsd.test.mk	Sat Oct 12 23:44:50 2013	(r256407)
@@ -36,9 +36,15 @@ WITHOUT_MAN=yes
 .endif
 
 # tell progs.mk we might want to install things
-PROG_VARS+= BINDIR
+BINDIR = ${TESTSDIR}
 PROGS_TARGETS+= install
 
+.ifdef PROG
+# we came here via bsd.progs.mk below
+# parent will do staging.
+MK_STAGING= no
+.endif
+
 .if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
 .include <bsd.progs.mk>
 .endif
@@ -76,4 +82,20 @@ test: beforetest realtest
 test: aftertest
 .endif
 
+.if !defined(PROG) && ${MK_STAGING} != "no"
+.if !defined(_SKIP_BUILD)
+# this will handle staging if needed
+_SKIP_STAGING= no
+# but we don't want it to build anything
+_SKIP_BUILD=
+.endif
+.if !empty(PROGS)
+stage_files.prog: ${PROGS}
+.endif
+
+.include <bsd.prog.mk>
+
+.endif
+.if !target(objwarn)
 .include <bsd.obj.mk>
+.endif