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.
This commit is contained in:
parent
c3ddb60e2d
commit
a3438dfc9b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=266104
@ -3,7 +3,6 @@
|
|||||||
#
|
#
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
|
||||||
.sinclude "Makefile.inc"
|
.sinclude "Makefile.inc"
|
||||||
|
|
||||||
SRCTOP?= ${.CURDIR:H:H}
|
SRCTOP?= ${.CURDIR:H:H}
|
||||||
@ -107,11 +106,6 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
|
|||||||
SUBDIR+= unit-tests
|
SUBDIR+= unit-tests
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_TESTS} != no
|
|
||||||
SUBDIR+= tests
|
|
||||||
.endif
|
|
||||||
|
|
||||||
|
|
||||||
MAN= ${PROG}.1
|
MAN= ${PROG}.1
|
||||||
MAN1= ${MAN}
|
MAN1= ${MAN}
|
||||||
|
|
||||||
|
@ -13,5 +13,9 @@ PROG= make
|
|||||||
NO_SHARED?= YES
|
NO_SHARED?= YES
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if defined(MK_TESTS) && ${MK_TESTS} != no
|
||||||
|
SUBDIR+= tests
|
||||||
|
.endif
|
||||||
|
|
||||||
WARNS=3
|
WARNS=3
|
||||||
CFLAGS+= -DNO_PWD_OVERRIDE
|
CFLAGS+= -DNO_PWD_OVERRIDE
|
||||||
|
Loading…
Reference in New Issue
Block a user