From 50a31d452c540902dc3440b10fdb5be335608fe8 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Thu, 16 May 2013 15:28:38 +0000
Subject: Build bmake by default. If someone explicitly builds usr.bin/make
 while MK_BMAKE==yes, install it as 'fmake'.

Reviewed by:	brooks
---
 share/mk/bsd.own.mk   | 2 +-
 usr.bin/make/Makefile | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index e74000a..dfa8ed6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -251,6 +251,7 @@ __DEFAULT_YES_OPTIONS = \
     BIND_UTILS \
     BINUTILS \
     BLUETOOTH \
+    BMAKE \
     BOOT \
     BSD_CPIO \
     BSNMP \
@@ -360,7 +361,6 @@ __DEFAULT_NO_OPTIONS = \
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
-    BMAKE \
     BSDCONFIG \
     BSD_GREP \
     CLANG_EXTRAS \
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 5442eaa..5bc8b87 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -111,4 +111,11 @@ CFLAGS+=	-DDEFSHELLNAME=\"${MAKE_SHELL}\"
 .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
 .endif
 
+.if ${MK_BMAKE} != "no"
+# if we are here we don't want this called 'make'
+PROG=	fmake
+fmake.1: make.1
+	cp ${.ALLSRC} ${.TARGET}
+.endif
+
 .include <bsd.prog.mk>
-- 
cgit v1.1