Use consistent style for optional subdirectories

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D3356

1 files changed, 15 insertions, 29 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 9feb396..64dffa9 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -9,8 +9,7 @@
 # Moved to secure: bdes
 #
 
-SUBDIR=	${_addr2line} \
-	alias \
+SUBDIR=	alias \
 	apply \
 	asa \
 	awk \
@@ -24,7 +23,6 @@ SUBDIR=	${_addr2line} \
 	chat \
 	chpass \
 	cksum \
-	${_clang} \
 	cmp \
 	col \
 	colldef \
@@ -36,12 +34,10 @@ SUBDIR=	${_addr2line} \
 	csplit \
 	ctlstat \
 	cut \
-	${_cxxfilt} \
 	dirname \
 	dpv \
 	du \
 	elf2aout \
-	${_elfcopy} \
 	elfdump \
 	enigma \
 	env \
@@ -62,7 +58,6 @@ SUBDIR=	${_addr2line} \
 	gzip \
 	head \
 	hexdump \
-	${_iconv} \
 	id \
 	ident \
 	ipcrm \
@@ -94,15 +89,11 @@ SUBDIR=	${_addr2line} \
 	lsvfs \
 	lzmainfo \
 	m4 \
-	${_makewhatis} \
-	${_man} \
 	mandoc \
 	mesg \
 	minigzip \
 	ministat \
-	${_mkcsmapper} \
 	mkdep \
-	${_mkesdb} \
 	mkfifo \
 	mkimg \
 	mklocale \
@@ -116,7 +107,6 @@ SUBDIR=	${_addr2line} \
 	nfsstat \
 	nice \
 	nl \
-	${_nm} \
 	numactl \
 	nohup \
 	opieinfo \
@@ -134,7 +124,6 @@ SUBDIR=	${_addr2line} \
 	procstat \
 	protect \
 	rctl \
-	${_readelf} \
 	renice \
 	rev \
 	revoke \
@@ -149,14 +138,12 @@ SUBDIR=	${_addr2line} \
 	seq \
 	shar \
 	showmount \
-	${_size} \
 	sockstat \
 	soelim \
 	sort \
 	split \
 	stat \
 	stdbuf \
-	${_strings} \
 	su \
 	systat \
 	tabs \
@@ -164,7 +151,6 @@ SUBDIR=	${_addr2line} \
 	tar \
 	tcopy \
 	tee \
-	${_tests} \
 	time \
 	timeout \
 	tip \
@@ -225,7 +211,7 @@ SUBDIR+=	calendar
 .endif
 
 .if ${MK_CLANG} != "no"
-_clang=		clang
+SUBDIR+=	clang
 .endif
 
 .if ${MK_EE} != "no"
@@ -233,13 +219,13 @@ SUBDIR+=	ee
 .endif
 
 .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
-_addr2line=	addr2line
-_cxxfilt=	cxxfilt
-_elfcopy=	elfcopy
-_nm=		nm
-_readelf=	readelf
-_size=		size
-_strings=	strings
+SUBDIR+=	addr2line
+SUBDIR+=	cxxfilt
+SUBDIR+=	elfcopy
+SUBDIR+=	nm
+SUBDIR+=	readelf
+SUBDIR+=	size
+SUBDIR+=	strings
 .endif
 
 .if ${MK_FILE} != "no"
@@ -267,9 +253,9 @@ SUBDIR+=	hesinfo
 .endif
 
 .if ${MK_ICONV} != "no"
-_iconv=		iconv
-_mkcsmapper=	mkcsmapper
-_mkesdb=	mkesdb
+SUBDIR+=	iconv
+SUBDIR+=	mkcsmapper
+SUBDIR+=	mkesdb
 .endif
 
 .if ${MK_ISCSI} != "no"
@@ -311,9 +297,9 @@ SUBDIR+=	bmake
 .if ${MK_MAN_UTILS} != "no"
 SUBDIR+=	catman
 .if ${MK_MANDOCDB} == "no"
-_makewhatis=	makewhatis
+SUBDIR+=	makewhatis
 .endif
-_man=		man
+SUBDIR+=	man
 .endif
 
 .if ${MK_NETCAT} != "no"
@@ -361,7 +347,7 @@ SUBDIR+=	telnet
 .endif
 
 .if ${MK_TESTS} != "no"
-_tests=		tests
+SUBDIR+=	tests
 .endif
 
 .if ${MK_TEXTPROC} != "no"