diff options
| author | imp <imp@FreeBSD.org> | 2014-05-15 01:27:24 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-15 01:27:24 +0000 |
| commit | a42e7aedc5d59e50ffd00aa60ffdf6ca30ee4488 (patch) | |
| tree | 9fa363abcebf2d75ebe256513bffc5032864bbae /usr.bin/bmake | |
| parent | 313ef5ff8f77850de4694b9c16ca510403cbc56f (diff) | |
| download | FreeBSD-src-a42e7aedc5d59e50ffd00aa60ffdf6ca30ee4488.zip FreeBSD-src-a42e7aedc5d59e50ffd00aa60ffdf6ca30ee4488.tar.gz | |
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.
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile | 6 | ||||
| -rw-r--r-- | 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 df5ae4b..b464454 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 25f9a3a..89c5f61 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 |
