Index: stable/11/cddl/usr.sbin/zfsd/Makefile
===================================================================
--- stable/11/cddl/usr.sbin/zfsd/Makefile	(revision 305908)
+++ stable/11/cddl/usr.sbin/zfsd/Makefile	(revision 305909)
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
-SRCDIR=${.CURDIR}/../../..
 .include "Makefile.common"
 
 PROG_CXX=	zfsd
 MAN=		zfsd.8
 
 .include <bsd.prog.mk>
 
 # The unittests require devel/googletest and devel/googlemock from ports.
 # Don't automatically build them.
 SUBDIR=
Index: stable/11/cddl/usr.sbin/zfsd/Makefile.common
===================================================================
--- stable/11/cddl/usr.sbin/zfsd/Makefile.common	(revision 305908)
+++ stable/11/cddl/usr.sbin/zfsd/Makefile.common	(revision 305909)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 SRCS=		callout.cc		\
 		case_file.cc		\
 		zfsd_event.cc		\
 		vdev.cc			\
 		vdev_iterator.cc	\
 		zfsd.cc			\
 		zfsd_exception.cc	\
 		zpool_list.cc		\
 		zfsd_main.cc
 
 WARNS?=		3
 
 # Ignore warnings about Solaris specific pragmas.
 IGNORE_PRAGMA=  YES
 
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common
-INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include
-INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem
-INCFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libumem/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+INCFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
 
 CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
 
 DPADD=  ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
 	${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL}
 LIBADD=  devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil
 
 cscope:
 	find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
 	     > ${.CURDIR}/cscope.files
 	cd ${.CURDIR} && cscope -buq ${INCFLAGS}
Index: stable/11/cddl/usr.sbin/zfsd/tests/Makefile
===================================================================
--- stable/11/cddl/usr.sbin/zfsd/tests/Makefile	(revision 305908)
+++ stable/11/cddl/usr.sbin/zfsd/tests/Makefile	(revision 305909)
@@ -1,45 +1,38 @@
 # $FreeBSD$
 
-SRCDIR=${.CURDIR}/../../../..
 .include "${.CURDIR}/../Makefile.common"
-.PATH:	${.CURDIR}/..
+.PATH:	${.CURDIR:H}
 
-TESTSDIR?=	${TESTSBASE}/cddl/usr.sbin/zfsd
-
 PLAIN_TESTS_CXX=	zfsd_unittest
 SRCS.zfsd_unittest:=		${SRCS:Nzfsd_main.cc}
 SRCS.zfsd_unittest+=		libmocks.c zfsd_unittest.cc
 SRCS=
 
 # Use #include <zfsd/xxx.h> in test programs.
-INCFLAGS+=	-I${.CURDIR}/../..
+INCFLAGS+=	-I${.CURDIR:H:H}
 
 .if defined(DESTDIR)
 INCFLAGS+=	-I${DESTDIR}/usr/include
 LIBRARY_PATH=	${DESTDIR}/lib:${DESTDIR}/usr/lib
 LDFLAGS.zfsd_unittest+=	-L${DESTDIR}/lib -L${DESTDIR}/usr/lib
 .elif defined(WORLDTMP)
 INCFLAGS+=	-I${WORLDTMP}/usr/include
 LIBRARY_PATH=	${WORLDTMP}/lib:${WORLDTMP}/usr/lib
 LDFLAGS.zfsd_unittest+=	-L${WORLDTMP}/lib -L${WORLDTMP}/usr/lib
 .else
 LIBRARY_PATH=
 .endif
 
 # Googletest options
-LOCALBASE?=	/usr/local
 INCFLAGS+=	-I${LOCALBASE}/include -D_THREAD_SAFE -pthread
 LDFLAGS.zfsd_unittest+=	-L${LOCALBASE}/lib -D_THREAD_SAFE -pthread
 LDADD.zfsd_unittest+=		${LOCALBASE}/lib/libgtest.a
 
 # GoogleMock options
 LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main.a
 
 # Googlemock fails if we don't have this line
 # https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J
 CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD
-
-# Install the tests
-TESTSBASE?=	/usr/tests
 
 .include <bsd.test.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 305908)
+++ stable/11	(revision 305909)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r305018-305020