Index: stable/10/usr.sbin/bhyve/Makefile
===================================================================
--- stable/10/usr.sbin/bhyve/Makefile	(revision 304568)
+++ stable/10/usr.sbin/bhyve/Makefile	(revision 304569)
@@ -1,58 +1,60 @@
 #
 # $FreeBSD$
 #
 
 PROG=	bhyve
 
 DEBUG_FLAGS= -g -O0 
 
 MAN=	bhyve.8
 
+BHYVE_SYSDIR?=${SRCTOP}
+
 SRCS=	\
 	atkbdc.c		\
 	acpi.c			\
 	bhyverun.c		\
 	block_if.c		\
 	bootrom.c		\
 	consport.c		\
 	dbgport.c		\
 	fwctl.c			\
 	inout.c			\
 	ioapic.c		\
 	mem.c			\
 	mevent.c		\
 	mptbl.c			\
 	pci_ahci.c		\
 	pci_e82545.c		\
 	pci_emul.c		\
 	pci_hostbridge.c	\
 	pci_irq.c		\
 	pci_lpc.c		\
 	pci_passthru.c		\
 	pci_virtio_block.c	\
 	pci_virtio_net.c	\
 	pci_virtio_rnd.c	\
 	pci_uart.c		\
 	pm.c			\
 	post.c			\
 	rtc.c			\
 	smbiostbl.c		\
 	task_switch.c		\
 	uart_emul.c		\
 	virtio.c		\
 	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}
 LDADD=	-lvmmapi -lmd -lutil -lpthread
 
 CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/e1000
 CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/mii
 CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/usb/controller
 
 WARNS?=	2
 
 .include <bsd.prog.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 304568)
+++ stable/10	(revision 304569)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r298355