Index: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile
===================================================================
--- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile	(revision 344338)
+++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile	(revision 344339)
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .include "Makefile.common"
 
 PROG_CXX=	zfsd
 MAN=		zfsd.8
 
-SUBDIR.${MK_GOOGLETEST}+=	tests
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
Index: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile	(revision 344338)
+++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile	(revision 344339)
@@ -1,45 +1,48 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
 
 LIB_CXX=	gmock
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 
 LIBADD+=	gtest
 LDFLAGS+=	-L${.OBJDIR:H}/gtest
 
 INCSGROUPS=	MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
 
 MAIN_INCSDIR=	${INCLUDEDIR}/gmock
 MAIN_INCS+=	gmock/gmock-matchers.h
 MAIN_INCS+=	gmock/gmock-more-actions.h
 MAIN_INCS+=	gmock/gmock-generated-actions.h
 MAIN_INCS+=	gmock/gmock-generated-matchers.h
 MAIN_INCS+=	gmock/gmock-generated-nice-strict.h
 MAIN_INCS+=	gmock/gmock-more-matchers.h
 MAIN_INCS+=	gmock/gmock-generated-function-mockers.h
 MAIN_INCS+=	gmock/gmock-cardinalities.h
 MAIN_INCS+=	gmock/gmock-spec-builders.h
 MAIN_INCS+=	gmock/gmock.h
 MAIN_INCS+=	gmock/gmock-actions.h
 
 INTERNAL_INCSDIR=	${INCLUDEDIR}/gmock/internal
 INTERNAL_INCS+=		gmock/internal/gmock-port.h
 INTERNAL_INCS+=		gmock/internal/gmock-internal-utils.h
 INTERNAL_INCS+=		gmock/internal/gmock-generated-internal-utils.h
 
 INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gmock/internal/custom
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-port.h
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-matchers.h
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-generated-actions.h
 
 SRCS+=		gmock-all.cc
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.lib.mk>
Index: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile	(revision 344338)
+++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile	(revision 344339)
@@ -1,24 +1,25 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
 
 LIB_CXX=	gmock_main
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 
 LIBADD+=	gmock
 # NB: LDFLAGS added for buildworld builds
 LDFLAGS+=	-L${LIBGTESTDIR}
 LDFLAGS+=	-L${LIBGMOCKDIR}
 
 SRCS+=		gmock_main.cc
 
-SUBDIR.${MK_TESTS}+=	tests
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
Index: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile	(revision 344338)
+++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile	(revision 344339)
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
 
 LIB_CXX=	gtest
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
 INCSGROUPS=	MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
 
 MAIN_INCSDIR=	${INCLUDEDIR}/gtest
 MAIN_INCS+=	gtest/gtest-death-test.h
 MAIN_INCS+=	gtest/gtest-message.h
 MAIN_INCS+=	gtest/gtest-param-test.h
 MAIN_INCS+=	gtest/gtest-printers.h
 MAIN_INCS+=	gtest/gtest-spi.h
 MAIN_INCS+=	gtest/gtest-test-part.h
 MAIN_INCS+=	gtest/gtest-typed-test.h
 MAIN_INCS+=	gtest/gtest.h
 MAIN_INCS+=	gtest/gtest_pred_impl.h
 MAIN_INCS+=	gtest/gtest_prod.h
 
 INTERNAL_INCSDIR=	${INCLUDEDIR}/gtest/internal
 INTERNAL_INCS+=	gtest/internal/gtest-death-test-internal.h
 INTERNAL_INCS+=	gtest/internal/gtest-filepath.h
 INTERNAL_INCS+=	gtest/internal/gtest-internal.h
 INTERNAL_INCS+=	gtest/internal/gtest-linked_ptr.h
 INTERNAL_INCS+=	gtest/internal/gtest-param-util-generated.h
 INTERNAL_INCS+=	gtest/internal/gtest-param-util.h
 INTERNAL_INCS+=	gtest/internal/gtest-port-arch.h
 INTERNAL_INCS+=	gtest/internal/gtest-port.h
 INTERNAL_INCS+=	gtest/internal/gtest-string.h
 INTERNAL_INCS+=	gtest/internal/gtest-tuple.h
 INTERNAL_INCS+=	gtest/internal/gtest-type-util.h
 
 INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gtest/internal/custom
 INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest-port.h
 INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest-printers.h
 INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest.h
 
 SRCS+=		gtest-all.cc
 
 LIBADD+=	pthread
 
-SUBDIR.${MK_TESTS}+=	tests
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
Index: projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile	(revision 344338)
+++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile	(revision 344339)
@@ -1,22 +1,23 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
 
 LIB_CXX=	gtest_main
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
 LIBADD+=	gtest
 # NB: LDFLAGS added for buildworld builds
 LDFLAGS+=	-L${LIBGTESTDIR}
 
 SRCS+=		gtest_main.cc
 
-SUBDIR.${MK_TESTS}+=	tests
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>