From 9768ccae056d693c0ab571a02d16d57ce8785c88 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 01:29:51 +0000
Subject: [PATCH] Merge from tbemd: Add directory names directly and sort at
 the end. Include bsd.arch.inc.mk so we can, in the future, more easily make
 arch dependent changes in /bin (unlikely, but is needed for symmetry).

---
 bin/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/Makefile b/bin/Makefile
index 3114e670097f..e5052cad51a5 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -8,7 +8,6 @@ SUBDIR= cat \
 	chio \
 	chmod \
 	cp \
-	${_csh} \
 	date \
 	dd \
 	df \
@@ -29,10 +28,8 @@ SUBDIR= cat \
 	ps \
 	pwait \
 	pwd \
-	${_rcp} \
 	realpath \
 	rm \
-	${_rmail} \
 	rmdir \
 	setfacl \
 	sh \
@@ -43,15 +40,19 @@ SUBDIR= cat \
 	uuidgen
 
 .if ${MK_RCMDS} != "no"
-_rcp=	rcp
+SUBDIR+=	rcp
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-_rmail=	rmail
+SUBDIR+=	rmail
 .endif
 
 .if ${MK_TCSH} != "no"
-_csh=	csh
+SUBDIR+=	csh
 .endif
 
+.include <bsd.arch.inc.mk>
+
+SUBDIR:=	${SUBDIR:O}
+
 .include <bsd.subdir.mk>