From owner-svn-src-user@FreeBSD.ORG  Sat Jun 13 22:54:47 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8A5C4103;
 Sat, 13 Jun 2015 22:54:47 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
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 7929086A;
 Sat, 13 Jun 2015 22:54:47 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DMslVu055948;
 Sat, 13 Jun 2015 22:54:47 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DMslrB055947;
 Sat, 13 Jun 2015 22:54:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201506132254.t5DMslrB055947@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 13 Jun 2015 22:54:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r284361 - user/ngie/more-tests
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2015 22:54:47 -0000

Author: ngie
Date: Sat Jun 13 22:54:46 2015
New Revision: 284361
URL: https://svnweb.freebsd.org/changeset/base/284361

Log:
  Re-add some guards around bmake-specific code in Makefile

Modified:
  user/ngie/more-tests/Makefile

Modified: user/ngie/more-tests/Makefile
==============================================================================
--- user/ngie/more-tests/Makefile	Sat Jun 13 22:40:40 2015	(r284360)
+++ user/ngie/more-tests/Makefile	Sat Jun 13 22:54:46 2015	(r284361)
@@ -99,6 +99,11 @@
 #
 # For more information, see the build(7) manual page.
 #
+.ifdef .PARSEDIR
+MK_META_MODE?=	yes
+.else
+MK_META_MODE=	no
+.endif
 .if ${MK_META_MODE} == "yes"
 # targets/Makefile plays the role of top-level
 .include "targets/Makefile"
@@ -521,6 +526,7 @@ universe_epilogue:
 buildLINT:
 	${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
 
+.ifdef .PARSEDIR
 # This makefile does not run in meta mode
 .MAKE.MODE= normal
 # Normally the things we run from here don't either.
@@ -532,6 +538,7 @@ MK_STAGING= no
 # tell meta.autodep.mk to not even think about updating anything.
 UPDATE_DEPENDFILE= NO
 .export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE
+.endif
 
 .if make(universe)
 # we do not want a failure of one branch abort all.