From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 01:29:51 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 88CBC106566B;
	Mon, 13 Sep 2010 01:29:51 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7858F8FC0C;
	Mon, 13 Sep 2010 01:29:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8D1Tpww044106;
	Mon, 13 Sep 2010 01:29:51 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8D1TpCL044104;
	Mon, 13 Sep 2010 01:29:51 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009130129.o8D1TpCL044104@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 01:29:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212515 - head/bin
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 01:29:51 -0000

Author: imp
Date: Mon Sep 13 01:29:51 2010
New Revision: 212515
URL: http://svn.freebsd.org/changeset/base/212515

Log:
  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).

Modified:
  head/bin/Makefile

Modified: head/bin/Makefile
==============================================================================
--- head/bin/Makefile	Mon Sep 13 01:27:54 2010	(r212514)
+++ head/bin/Makefile	Mon Sep 13 01:29:51 2010	(r212515)
@@ -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>