From a3438dfc9b10e20a9b2878dbe250b5eec3dc5031 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 15 May 2014 01:27:24 +0000
Subject: [PATCH] Undo changes to the generated Makefile. Move tests directory
 to proper location, including updating the test to work in the more-fragile
 fmake -> bmake bootstrap environment.

---
 usr.bin/bmake/Makefile     | 6 ------
 usr.bin/bmake/Makefile.inc | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index df5ae4b90216..b46445476fe9 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -3,7 +3,6 @@
 #
 # $FreeBSD$
 
-.include <src.opts.mk>
 .sinclude "Makefile.inc"
 
 SRCTOP?= ${.CURDIR:H:H}
@@ -107,11 +106,6 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
 SUBDIR+= unit-tests
 .endif
 
-.if ${MK_TESTS} != no
-SUBDIR+= tests
-.endif
-
-
 MAN= ${PROG}.1
 MAN1= ${MAN}
 
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index 25f9a3a96b88..89c5f61f4d7a 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -13,5 +13,9 @@ PROG= make
 NO_SHARED?=     YES
 .endif
 
+.if defined(MK_TESTS) && ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
 WARNS=3
 CFLAGS+= -DNO_PWD_OVERRIDE