From 541bd491e748877546c6a5cab2dbc23e05fe825f Mon Sep 17 00:00:00 2001
From: grehan <grehan@FreeBSD.org>
Date: Wed, 20 Apr 2016 17:05:32 +0000
Subject: [PATCH] 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
---
 usr.sbin/bhyve/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index d85403c5b722..7d2e2f0ed171 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -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