svn commit: r256407 - projects/bmake/share/mk

[Simon J. Gerraty]

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