From owner-svn-src-all@freebsd.org  Sun Aug 21 17:57: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 C7CD4BC10BB;
 Sun, 21 Aug 2016 17:57:33 +0000 (UTC) (envelope-from mav@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 96F7219CF;
 Sun, 21 Aug 2016 17:57:33 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7LHvWIf006032;
 Sun, 21 Aug 2016 17:57:32 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7LHvWQg006031;
 Sun, 21 Aug 2016 17:57:32 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201608211757.u7LHvWQg006031@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 21 Aug 2016 17:57:32 +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: r304569 - stable/10/usr.sbin/bhyve
X-SVN-Group: stable-10
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.22
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: Sun, 21 Aug 2016 17:57:33 -0000

Author: mav
Date: Sun Aug 21 17:57:32 2016
New Revision: 304569
URL: https://svnweb.freebsd.org/changeset/base/304569

Log:
  MFC r298355:
  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:
  stable/10/usr.sbin/bhyve/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bhyve/Makefile
==============================================================================
--- stable/10/usr.sbin/bhyve/Makefile	Sun Aug 21 17:26:16 2016	(r304568)
+++ stable/10/usr.sbin/bhyve/Makefile	Sun Aug 21 17:57:32 2016	(r304569)
@@ -8,6 +8,8 @@ DEBUG_FLAGS= -g -O0 
 
 MAN=	bhyve.8
 
+BHYVE_SYSDIR?=${SRCTOP}
+
 SRCS=	\
 	atkbdc.c		\
 	acpi.c			\
@@ -43,7 +45,7 @@ SRCS=	\
 	xmsr.c			\
 	spinup_ap.c
 
-.PATH:	${.CURDIR}/../../sys/amd64/vmm
+.PATH:  ${BHYVE_SYSDIR}/sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
 DPADD=	${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD}