From 43bd9a742238917acb4c04c6a9ea8ef05815f752 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 17 May 2013 22:18:27 +0000
Subject: 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.

---
 usr.bin/bmake/Makefile.inc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'usr.bin/bmake/Makefile.inc')

diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index 7b5f545..7567887 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -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
-- 
cgit v1.1