diff options
| author | imp <imp@FreeBSD.org> | 2014-05-15 15:45:45 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-15 15:45:45 +0000 |
| commit | 1b98bc1fb5285446f904e00ca615a54a9c43273e (patch) | |
| tree | abc2337468af78a9e9c97083e7d873ea06ad9317 /usr.bin/bmake | |
| parent | 7d5e715c1466eca591d2cfdb3fc2e87896140ea3 (diff) | |
| download | FreeBSD-src-1b98bc1fb5285446f904e00ca615a54a9c43273e.zip FreeBSD-src-1b98bc1fb5285446f904e00ca615a54a9c43273e.tar.gz | |
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...
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 89c5f61..ad7faad 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -13,7 +13,10 @@ PROG= make NO_SHARED?= YES .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 .endif |
