Index: projects/bmake/targets/Makefile.xtras
===================================================================
--- projects/bmake/targets/Makefile.xtras	(revision 283687)
+++ projects/bmake/targets/Makefile.xtras	(revision 283688)
@@ -1,48 +1,59 @@
 # $FreeBSD$
 #
 # Makefile.xtras - non-build targets
 
 # Resist the urge to fill this with miscellaneous junk
 
 # We are not building here (shouldn't be), so no meta mode.
 .MAKE.MODE = normal
 
 _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)
 OTHER_TARGETS = \
 	destroy \
 
 BUILD_TARGETS != cd ${_here} && \
 	find . \( -name Makefile.depend -o -name ${.MAKE.DEPENDFILE:T} \) | \
 	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
 
 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
 
 not-valid-target:
 	@echo "ERROR: '${_TARGETS}' is not a valid target for ${MACHINE}."
 
 
 .for t in ${_TARGETS:Nlove}
 .if !target($t)
 $t: not-valid-target show-help
 .endif
 .endfor