From owner-svn-src-stable-10@freebsd.org  Wed Jun  8 18:21:26 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A08FB6F984;
 Wed,  8 Jun 2016 18:21:26 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4812D1DA8;
 Wed,  8 Jun 2016 18:21:26 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58ILP9D051741;
 Wed, 8 Jun 2016 18:21:25 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58ILPq0051720;
 Wed, 8 Jun 2016 18:21:25 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606081821.u58ILPq0051720@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 8 Jun 2016 18:21:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301678 - stable/10/tools/tools/ioat
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2016 18:21:26 -0000

Author: ngie
Date: Wed Jun  8 18:21:25 2016
New Revision: 301678
URL: https://svnweb.freebsd.org/changeset/base/301678

Log:
  MFC r300861,r300862:
  
  r300861:
  
  - Sort make variables
  - Use SRCTOP instead of ad hoc definition for it
  
  r300862:
  
  Install ioatcontrol to /usr/bin by default instead of /

Modified:
  stable/10/tools/tools/ioat/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tools/tools/ioat/Makefile
==============================================================================
--- stable/10/tools/tools/ioat/Makefile	Wed Jun  8 18:19:34 2016	(r301677)
+++ stable/10/tools/tools/ioat/Makefile	Wed Jun  8 18:21:25 2016	(r301678)
@@ -2,9 +2,13 @@
 
 PROG=	ioatcontrol
 MAN=	ioatcontrol.8
-CFLAGS+=	-I${.CURDIR:H:H:H}/sys/dev/ioat
-WARNS?=	6
+BINDIR?=	/usr/bin
+
+CFLAGS+=	-I${SRCTOP}/sys/dev/ioat
+
 #LIBADD=	util
 LDADD=	-lutil
 
+WARNS?=	6
+
 .include <bsd.prog.mk>