Makefile.inc is also included by the tests subdirectory, which results
in SUBDIRS having tests added to it, which fails. Work around this by checking to make sure tests exists before adding it to subdirs and work to get the generated file fixed so we can rename Makefile.inc to something else so it isn't automatically included by subdirs...
This commit is contained in:
parent
ba51c05bed
commit
0629d5e958
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=266147
@ -13,7 +13,10 @@ PROG= make
|
|||||||
NO_SHARED?= YES
|
NO_SHARED?= YES
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(MK_TESTS) && ${MK_TESTS} != no
|
# 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
|
SUBDIR+= tests
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user