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

[Warner Losh]

Author: imp
Date: Thu May 15 15:45:45 2014
New Revision: 266147
URL: http://svnweb.freebsd.org/changeset/base/266147

Log:
  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...

Modified:
  head/usr.bin/bmake/Makefile.inc

Modified: head/usr.bin/bmake/Makefile.inc
==============================================================================
--- head/usr.bin/bmake/Makefile.inc	Thu May 15 15:43:33 2014	(r266146)
+++ head/usr.bin/bmake/Makefile.inc	Thu May 15 15:45:45 2014	(r266147)
@@ -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