From owner-svn-src-all@FreeBSD.ORG  Fri Jun 11 02:50:54 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 4A898106564A;
	Fri, 11 Jun 2010 02:50:54 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A7BB8FC16;
	Fri, 11 Jun 2010 02:50:54 +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 o5B2os54043140;
	Fri, 11 Jun 2010 02:50:54 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5B2osKq043139;
	Fri, 11 Jun 2010 02:50:54 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201006110250.o5B2osKq043139@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 Jun 2010 02:50:54 +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: r209025 - head/share/mk
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: Fri, 11 Jun 2010 02:50:54 -0000

Author: imp
Date: Fri Jun 11 02:50:53 2010
New Revision: 209025
URL: http://svn.freebsd.org/changeset/base/209025

Log:
  Merge from tbemd
  
  Enhance Makefile.inc processing, when asked for, to include the most
  specific (MACHINE specific) to least specific (MACHINE_CPUARCH).
  
  Reviewed by:	arch@ (mostly silence though)

Added:
     - copied unchanged from r209024, user/imp/tbemd/share/mk/bsd.arch.inc.mk
Directory Properties:
  head/share/mk/bsd.arch.inc.mk   (props changed)

Copied: head/share/mk/bsd.arch.inc.mk (from r209024, user/imp/tbemd/share/mk/bsd.arch.inc.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/mk/bsd.arch.inc.mk	Fri Jun 11 02:50:53 2010	(r209025, copy of r209024, user/imp/tbemd/share/mk/bsd.arch.inc.mk)
@@ -0,0 +1,11 @@
+#
+# Include the arch-specific Makefile.inc.$ARCH.  We go from most specific
+# to least specific, stopping after we get a hit.
+#
+.if exists(${.CURDIR}/Makefile.${MACHINE})
+.include "Makefile.${MACHINE}"
+.elif exists(${.CURDIR}/Makefile.${MACHINE_ARCH})
+.include "Makefile.${MACHINE_ARCH}"
+.elif exists(${.CURDIR}/Makefile.${MACHINE_CPUARCH})
+.include "Makefile.${MACHINE_CPUARCH}"
+.endif