From owner-svn-src-all@FreeBSD.ORG  Sat Jun 16 16:51:43 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40132106566B;
	Sat, 16 Jun 2012 16:51:43 +0000 (UTC) (envelope-from rmh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B13A8FC0C;
	Sat, 16 Jun 2012 16:51:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5GGphME055301;
	Sat, 16 Jun 2012 16:51:43 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5GGpgX8055299;
	Sat, 16 Jun 2012 16:51:42 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201206161651.q5GGpgX8055299@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Sat, 16 Jun 2012 16:51:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237165 - head/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 16 Jun 2012 16:51:43 -0000

Author: rmh
Date: Sat Jun 16 16:51:42 2012
New Revision: 237165
URL: http://svn.freebsd.org/changeset/base/237165

Log:
  In CTFCONVERT_CMD initialization, check that ${MAKE_VERSION} is defined
  before using it. Bootstrap make (as built by usr.bin/make/Makefile.dist)
  does not define this variable, but it needs to parse bsd.own.mk in order
  to build a complete make.

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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Jun 16 13:55:31 2012	(r237164)
+++ head/share/mk/bsd.own.mk	Sat Jun 16 16:51:42 2012	(r237165)
@@ -639,7 +639,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif ${MAKE_VERSION} >= 5201111300
+.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
 CTFCONVERT_CMD=
 .else
 CTFCONVERT_CMD=	@: