Date: Thu, 15 May 2014 01:27:25 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266104 - head/usr.bin/bmake Message-ID: <201405150127.s4F1RPxK072767@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 ============================================================================== --- head/usr.bin/bmake/Makefile Thu May 15 01:06:27 2014 (r266103) +++ head/usr.bin/bmake/Makefile Thu May 15 01:27:24 2014 (r266104) @@ -3,7 +3,6 @@ # # $FreeBSD$ -.include <src.opts.mk> .sinclude "Makefile.inc" SRCTOP?= ${.CURDIR:H:H} @@ -107,11 +106,6 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FIL SUBDIR+= unit-tests .endif -.if ${MK_TESTS} != no -SUBDIR+= tests -.endif - - MAN= ${PROG}.1 MAN1= ${MAN} 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 + WARNS=3 CFLAGS+= -DNO_PWD_OVERRIDE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405150127.s4F1RPxK072767>