From owner-svn-src-head@FreeBSD.ORG  Fri May 17 22:18:28 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 37FFC8FF;
 Fri, 17 May 2013 22:18:28 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2A3DE101;
 Fri, 17 May 2013 22:18:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HMISLh047906;
 Fri, 17 May 2013 22:18:28 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HMISSr047905;
 Fri, 17 May 2013 22:18:28 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201305172218.r4HMISSr047905@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 17 May 2013 22:18:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250755 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Fri, 17 May 2013 22:18:28 -0000

Author: sjg
Date: Fri May 17 22:18:27 2013
New Revision: 250755
URL: http://svnweb.freebsd.org/changeset/base/250755

Log:
  Per the comment, we cannot rely on bsd.own.mk
  we could be on an old system that knows noting of MK_BMAKE
  or on an almost up to date one that is defaulting it to "no"
  neither of which will work.

Modified:
  head/usr.bin/bmake/Makefile.inc

Modified: head/usr.bin/bmake/Makefile.inc
==============================================================================
--- head/usr.bin/bmake/Makefile.inc	Fri May 17 21:45:52 2013	(r250754)
+++ head/usr.bin/bmake/Makefile.inc	Fri May 17 22:18:27 2013	(r250755)
@@ -1,12 +1,5 @@
 # $FreeBSD$ 
 
-# we need the up to date bsd.own.mk
-.if ${.CURDIR:M*make} == ""
-.sinclude "share/mk/bsd.own.mk"
-.else
-.sinclude "../../share/mk/bsd.own.mk"
-.endif
-# the above should have found it...
 .include "bsd.own.mk"
 
 .if defined(.PARSEDIR)
@@ -14,6 +7,12 @@
 .export SRCTOP
 .endif
 
+# Sadly, we cannot assume bsd.own.mk did its job,
+# nor can we safely include the one we want
+.if !defined(WITHOUT_BMAKE)
+MK_BMAKE= yes
+.endif
+
 .if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
 PROG= make
 .endif