From owner-svn-src-head@FreeBSD.ORG  Mon Apr  7 21:16:52 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2DB14747;
 Mon,  7 Apr 2014 21:16:52 +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 1AD08391;
 Mon,  7 Apr 2014 21:16:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37LGpjT051564;
 Mon, 7 Apr 2014 21:16:51 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37LGp93051563;
 Mon, 7 Apr 2014 21:16:51 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404072116.s37LGp93051563@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 7 Apr 2014 21:16:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264239 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Apr 2014 21:16:52 -0000

Author: imp
Date: Mon Apr  7 21:16:51 2014
New Revision: 264239
URL: http://svnweb.freebsd.org/changeset/base/264239

Log:
  Need to test .MAKE.LEVEL everywhere before using it for bootstrapping
  issues between fmake and bmake.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Mon Apr  7 21:12:09 2014	(r264238)
+++ head/share/mk/bsd.own.mk	Mon Apr  7 21:16:51 2014	(r264239)
@@ -440,7 +440,7 @@ MK_${var}:=	yes
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
 .if defined(MK_${var})
-.if ${.MAKE.LEVEL} == 0
+.if defined(.MAKE.LEVEL) && ${.MAKE.LEVEL} == 0
 .error MK_${var} can't be set by a user.
 .endif
 .else
@@ -601,7 +601,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
 .if defined(MK_${var})
-.if ${.MAKE.LEVEL} == 0
+.if defined(.MAKE.LEVEL) && ${.MAKE.LEVEL} == 0
 .error MK_${var} can't be set by a user.
 .endif
 .else