From 9cbd35ae071caa30146bd92e8e074eb094bfff5b Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 20 Jul 2017 01:19:05 +0000
Subject: [PATCH] MFC r290570:

Reduce the Makefile snippet complexity a bit

- Set BINDIR to TESTSDIR globally (and subsequently, remove all
  `${FILESGROUP}DIR` setting because BINDIR is set to `TESTSDIR`)
- Set MAN to "" globally, instead of per-PROG


git-svn-id: svn://svn.freebsd.org/base/stable/10@321281 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 cddl/usr.sbin/dtrace/tests/Makefile.inc1 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cddl/usr.sbin/dtrace/tests/Makefile.inc1 b/cddl/usr.sbin/dtrace/tests/Makefile.inc1
index 6958f7873..7737bf0dd 100644
--- a/cddl/usr.sbin/dtrace/tests/Makefile.inc1
+++ b/cddl/usr.sbin/dtrace/tests/Makefile.inc1
@@ -11,9 +11,6 @@ ${TESTGROUP}= ${TESTFILES}
 ${TESTGROUP}EXE= ${TESTEXES}
 ${TESTGROUP}EXEMODE= 0555
 
-${TESTGROUP}DIR= ${TESTSDIR}
-${TESTGROUP}EXEDIR= ${TESTSDIR}
-
 TESTWRAPPER=	t_dtrace_contrib
 ATF_TESTS_SH+=	${TESTWRAPPER}
 TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh"
@@ -32,14 +29,15 @@ CLEANFILES+=	${TESTWRAPPER}.sh
 PROGS=		${CFILES:T:S/.c$/.exe/g}
 .for prog in ${PROGS}
 SRCS.${prog}+= ${prog:S/.exe$/.c/}
-BINDIR.${prog}= ${TESTSDIR}
-MAN.${prog}=
 
 .if exists(${prog:S/^tst.//:S/.exe$/.d/})
 SRCS.${prog}+=	${prog:S/^tst.//:S/.exe$/.d/}
 .endif
 .endfor
 
+BINDIR=		${TESTSDIR}
+MAN=
+
 # Some tests depend on the internals of their corresponding test programs,
 # so make sure the optimizer doesn't interfere with them.
 CFLAGS+=	-O0
-- 
2.45.0