From owner-svn-src-all@freebsd.org  Wed Apr 20 17:05:33 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 3FD43B15A5D;
 Wed, 20 Apr 2016 17:05:33 +0000 (UTC)
 (envelope-from grehan@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 1230E125B;
 Wed, 20 Apr 2016 17:05:33 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3KH5Wco013077;
 Wed, 20 Apr 2016 17:05:32 GMT (envelope-from grehan@FreeBSD.org)
Received: (from grehan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3KH5Wi3013076;
 Wed, 20 Apr 2016 17:05:32 GMT (envelope-from grehan@FreeBSD.org)
Message-Id: <201604201705.u3KH5Wi3013076@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grehan set sender to
 grehan@FreeBSD.org using -f
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 20 Apr 2016 17:05:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298355 - head/usr.sbin/bhyve
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 17:05:33 -0000

Author: grehan
Date: Wed Apr 20 17:05:32 2016
New Revision: 298355
URL: https://svnweb.freebsd.org/changeset/base/298355

Log:
  Don't use SYSDIR to avoid conflicts with existing usage.
  Also, use SRCTOP to locate the top of the source tree
  instead of a relative path.
  
  PR:	208856

Modified:
  head/usr.sbin/bhyve/Makefile

Modified: head/usr.sbin/bhyve/Makefile
==============================================================================
--- head/usr.sbin/bhyve/Makefile	Wed Apr 20 16:19:44 2016	(r298354)
+++ head/usr.sbin/bhyve/Makefile	Wed Apr 20 17:05:32 2016	(r298355)
@@ -9,7 +9,7 @@ DEBUG_FLAGS= -g -O0
 
 MAN=	bhyve.8
 
-SYSDIR?=${.CURDIR}/../..
+BHYVE_SYSDIR?=${SRCTOP}
 
 SRCS=	\
 	atkbdc.c		\
@@ -45,7 +45,7 @@ SRCS=	\
 	xmsr.c			\
 	spinup_ap.c
 
-.PATH:  ${SYSDIR}/sys/amd64/vmm
+.PATH:  ${BHYVE_SYSDIR}/sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
 LIBADD=	vmmapi md pthread