From owner-svn-src-head@freebsd.org  Wed Oct 19 21:26:00 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0988C1948F;
 Wed, 19 Oct 2016 21:26:00 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9223FBA3;
 Wed, 19 Oct 2016 21:26:00 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9JLPxPJ050908;
 Wed, 19 Oct 2016 21:25:59 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9JLPxcX050907;
 Wed, 19 Oct 2016 21:25:59 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610192125.u9JLPxcX050907@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 19 Oct 2016 21:25:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r307659 - head/gnu/usr.bin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Oct 2016 21:26:00 -0000

Author: emaste
Date: Wed Oct 19 21:25:59 2016
New Revision: 307659
URL: https://svnweb.freebsd.org/changeset/base/307659

Log:
  Switch gnu/usr.bin/Makefile to SUBDIR.${MK_*} optional subdir style

Modified:
  head/gnu/usr.bin/Makefile

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Wed Oct 19 21:07:17 2016	(r307658)
+++ head/gnu/usr.bin/Makefile	Wed Oct 19 21:25:59 2016	(r307659)
@@ -2,48 +2,27 @@
 
 .include <src.opts.mk>
 
-SUBDIR= ${_binutils} \
-	${_cc} \
-	diff \
+SUBDIR= diff \
 	diff3 \
-	${_dtc} \
-	${_gdb} \
-	${_gperf} \
-	grep \
-	${_groff} \
-	${_tests}
+	grep
 
 SUBDIR_DEPEND_gdb= ${_binutils}
 
 .if ${MK_CXX} != "no"
-.if ${MK_GCC} != "no"
-_gperf=		gperf
-.endif
-.if ${MK_GROFF} != "no"
-_groff=		groff
-.endif
+SUBDIR.${MK_GCC}+=	gperf
+SUBDIR.${MK_GROFF}+=	groff
 .endif
 
-.if ${MK_GPL_DTC} != "no"
-_dtc=		dtc
-.endif
-
-.if ${MK_TESTS} != "no"
-_tests=		tests
-.endif
+SUBDIR.${MK_BINUTILS}+=	binutils
+SUBDIR.${MK_DIALOG}+=	dialog
 
 .if ${MK_BINUTILS} != "no"
-_binutils=	binutils
-.if ${MK_GDB} != "no"
-_gdb=		gdb
-.endif
+SUBDIR.${MK_GDB}+=	gdb
 .endif
 
-.if ${MK_GCC} != "no"
-_cc=		cc
-.endif
-
-SUBDIR.${MK_DIALOG}+=	dialog
+SUBDIR.${MK_GCC}+=	cc
+SUBDIR.${MK_GPL_DTC}+=	dtc
+SUBDIR.${MK_TESTS}+=	tests
 
 SUBDIR_PARALLEL=