From owner-svn-src-all@FreeBSD.ORG  Thu May 15 01:27:25 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B67DF103;
 Thu, 15 May 2014 01:27:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A3D76210B;
 Thu, 15 May 2014 01:27:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4F1RP6v072769;
 Thu, 15 May 2014 01:27:25 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4F1RPxK072767;
 Thu, 15 May 2014 01:27:25 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405150127.s4F1RPxK072767@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 15 May 2014 01:27:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266104 - head/usr.bin/bmake
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 May 2014 01:27:25 -0000

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