From owner-svn-src-projects@FreeBSD.ORG  Fri May 29 06:44:10 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24577EDE;
 Fri, 29 May 2015 06:44:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
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 0F4BB1E8F;
 Fri, 29 May 2015 06:44:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4T6i9Q1051509;
 Fri, 29 May 2015 06:44:09 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4T6i9BZ051508;
 Fri, 29 May 2015 06:44:09 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201505290644.t4T6i9BZ051508@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 29 May 2015 06:44:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r283688 - projects/bmake/targets
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2015 06:44:10 -0000

Author: sjg
Date: Fri May 29 06:44:09 2015
New Revision: 283688
URL: https://svnweb.freebsd.org/changeset/base/283688

Log:
  Adapt based on whether 'mk' wrapper is used.
  
  If 'mk' is used we can expect SB_NAME to be set.
  Use 'mk' versions of command suggestions.
  Otherwise 'make' version - a bit more cumbersom.

Modified:
  projects/bmake/targets/Makefile.xtras

Modified: projects/bmake/targets/Makefile.xtras
==============================================================================
--- projects/bmake/targets/Makefile.xtras	Fri May 29 06:31:39 2015	(r283687)
+++ projects/bmake/targets/Makefile.xtras	Fri May 29 06:44:09 2015	(r283688)
@@ -11,9 +11,19 @@ _here := ${_PARSEDIR}
 
 .MAIN: no-default
 
+.if !empty(SB_NAME)
+# mk wrapper
+MAKE_CMD= mk
+MAKE_MACHINE_CMD= mk --machine <machine>
+.else
+# not using 'mk'
+MAKE_CMD= ${.MAKE:T}
+MAKE_MACHINE_CMD= env MACHINE=<machine> ${.MAKE:T}
+.endif
+
 no-default:
 	@echo "ERROR: there is no supported default target."; \
-	echo "Try 'mk help'"
+	echo "Try '${MAKE_CMD} help'"
 
 
 .if make(show-valid-targets)
@@ -25,7 +35,8 @@ BUILD_TARGETS != cd ${_here} && \
 	sed 's,/Makefile.*,,;s,^./,,' | sort -u
 
 show-valid-targets:
-	@echo "Build targets for ${MACHINE}:"; echo "${BUILD_TARGETS:ts\n}"
+	@echo "Build targets for ${MACHINE} (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):"
+	@echo "${BUILD_TARGETS:ts\n}"
 	@echo; echo "Other targets:"; echo "${OTHER_TARGETS:ts\n}"
 .endif
 
@@ -33,7 +44,7 @@ help: show-help
 show-help:
 	@echo; \
 	echo "You can see the targets which are valid for a given machine"; \
-	echo "by running 'mk --machine <machine> show-valid-targets'"; \
+	echo "by running '${MAKE_MACHINE_CMD} show-valid-targets'"; \
 	echo "For other information, read: ${HELP_DOCS:@d@${.newline}$d@}"; \
 	echo