svn commit: r266104 - head/usr.bin/bmake

[Warner Losh]

On May 15, 2014, at 9:31 AM, Julio Merino <jmmv at freebsd.org> wrote:

> On May 14, 2014, at 21:27, Warner Losh <imp at FreeBSD.org> wrote:
> 
>> Author: imp
>> Date: Thu May 15 01:27:24 2014
>> New Revision: 266104
>> URL: http://svnweb.freebsd.org/changeset/base/266104
>> 
>> Log:
>> 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.
>> 
>> Modified:
>> head/usr.bin/bmake/Makefile
>> head/usr.bin/bmake/Makefile.inc
> [...]
>> Modified: head/usr.bin/bmake/Makefile.inc
>> ==============================================================================
>> --- head/usr.bin/bmake/Makefile.inc	Thu May 15 01:06:27 2014	(r266103)
>> +++ head/usr.bin/bmake/Makefile.inc	Thu May 15 01:27:24 2014	(r266104)
>> @@ -13,5 +13,9 @@ PROG= make
>> NO_SHARED?=     YES
>> .endif
>> 
>> +.if defined(MK_TESTS) && ${MK_TESTS} != no
>> +SUBDIR+= tests
>> +.endif
>> +
> 
> Ugh, and this broke the build when MK_TESTS=yes.  The problem is that tests/Makefile transparently includes ../Makefile.inc, which defines SUBDIR+=tests (as above)... and this is obviously invalid within the tests subdirectory.
> 
> What's your suggestion to fix this?  I can think of renaming Makefile.inc to something different to ensure that the subdirectories don't spuriously include it.	

That may be the best solution, but I’d like a little time to think about it… The other option is to toss an && exists(${.CURDIR}/tests) on the end as well...

Warner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 842 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20140515/8fe3b959/attachment.sig>