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.
svn path=/head/; revision=266104
2014-05-15 01:27:24 +00:00 · 2014-05-15 01:27:24 +00:00 · a3438dfc9b · 2020-12-20 02:59:44 +00:00
commit a3438dfc9b
parent c3ddb60e2d
2 changed files with 4 additions and 6 deletions
--- 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}

--- 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