Index: stable/10/usr.bin/bmake/Makefile.inc
===================================================================
--- stable/10/usr.bin/bmake/Makefile.inc	(revision 288402)
+++ stable/10/usr.bin/bmake/Makefile.inc	(revision 288403)
@@ -1,32 +1,32 @@
 # $FreeBSD$ 
 
 .include "bsd.own.mk"
 
 .if defined(.PARSEDIR)
 # make sure this is available to unit-tests/Makefile
 .export SRCTOP
 .endif
 
 # Sadly, we cannot assume bsd.own.mk did its job,
 # nor can we safely include the one we want
 .if !defined(WITHOUT_BMAKE)
 MK_BMAKE= yes
 .endif
 
-.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
+.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" && exists(${.CURDIR}/tests)
 PROG= make
 .endif
 
 .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=     YES
 .endif
 
 # hack to not add tests to tests subdir since this is included from
 # there and to avoid renaming things that require changes to generated
 # files.
 .if defined(MK_TESTS) && ${MK_TESTS} != no && exists(${.CURDIR}/tests)
 SUBDIR+= tests
 .endif
 
 WARNS=3
 CFLAGS+= -DNO_PWD_OVERRIDE
Index: stable/10
===================================================================
--- stable/10	(revision 288402)
+++ stable/10	(revision 288403)

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