From owner-svn-src-head@FreeBSD.ORG  Thu Aug 26 15:49:52 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 945F31065695;
	Thu, 26 Aug 2010 15:49:52 +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 83F1B8FC16;
	Thu, 26 Aug 2010 15:49:52 +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 o7QFnqgi046939;
	Thu, 26 Aug 2010 15:49:52 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7QFnqRF046937;
	Thu, 26 Aug 2010 15:49:52 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201008261549.o7QFnqRF046937@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 26 Aug 2010 15:49:52 +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: r211846 - head/usr.sbin
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Aug 2010 15:49:52 -0000

Author: imp
Date: Thu Aug 26 15:49:52 2010
New Revision: 211846
URL: http://svn.freebsd.org/changeset/base/211846

Log:
  Make sure TARGET_ABI is defined.  TARGET_ABI will die a horrible death
  after we get all of TBEMD merged back into head, and make mips64 imply
  n64, so don't bother to make this 100% pretty.  You'll have to settle
  for only 64% pretty.

Modified:
  head/usr.sbin/Makefile

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Thu Aug 26 14:54:12 2010	(r211845)
+++ head/usr.sbin/Makefile	Thu Aug 26 15:49:52 2010	(r211846)
@@ -413,7 +413,7 @@ _crunch=	crunch
 
 .if ${MK_USB} != "no"
 .if ${MACHINE_ARCH} != "ia64" && \
-	!(${MACHINE_ARCH} == "mips" && ${TARGET_ABI} == "n64")
+   !(${MACHINE_ARCH} == "mips" && defined(TARGET_ABI) && ${TARGET_ABI} == "n64")
 _uathload=	uathload
 .endif
 _uhsoctl=	uhsoctl