Improved documentation for "make help".

The check for target(help) prevents a warning when "make help" is run from
a category directory.

5 files changed, 14 insertions, 8 deletions

diff --git a/mk/checksum/bsd.checksum-vars.mk b/mk/checksum/bsd.checksum-vars.mk
index 2aa278033b9..8259d7563d9 100644
--- a/mk/checksum/bsd.checksum-vars.mk
+++ b/mk/checksum/bsd.checksum-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.checksum-vars.mk,v 1.2 2008/05/22 16:27:22 joerg Exp $
+# $NetBSD: bsd.checksum-vars.mk,v 1.3 2018/01/07 11:23:37 rillig Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -8,6 +8,7 @@
 #
 #    DISTINFO_FILE is the path to file containing the checksums.
 #
+# Keywords: distinfo
 
 DISTINFO_FILE?=		${PKGDIR}/distinfo
 
diff --git a/mk/checksum/bsd.checksum.mk b/mk/checksum/bsd.checksum.mk
index d8192c14f82..cac0d731a1b 100644
--- a/mk/checksum/bsd.checksum.mk
+++ b/mk/checksum/bsd.checksum.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.checksum.mk,v 1.10 2009/07/15 09:40:30 joerg Exp $
+# $NetBSD: bsd.checksum.mk,v 1.11 2018/01/07 11:23:37 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "checksum" phase.
@@ -40,6 +40,7 @@
 #
 #	Default value: undefined
 #
+# Keywords: distinfo
 
 .PHONY: checksum checksum-phase
 .PHONY: makesum makepatchsum mps mdi makedistinfo distinfo
diff --git a/mk/help/help.mk b/mk/help/help.mk
index 67fbe379eaa..9f95ad1d5c8 100644
--- a/mk/help/help.mk
+++ b/mk/help/help.mk
@@ -1,4 +1,4 @@
-# $NetBSD: help.mk,v 1.13 2017/10/31 16:24:42 rillig Exp $
+# $NetBSD: help.mk,v 1.14 2018/01/07 11:23:37 rillig Exp $
 #
 
 # This is the integrated pkgsrc online help system. To query for the
@@ -25,9 +25,10 @@ TOPIC?=		${VARNAME}
 TOPIC?=		${topic}
 .endif
 
+.if !target(help)
 .PHONY: help
 help:
-.if !defined(TOPIC)
+.  if !defined(TOPIC)
 	@${ECHO} "usage: "${MAKE:Q}" help topic=<topic>"
 	@${ECHO} ""
 	@${ECHO} "	<topic> may be a variable name or a make target,"
@@ -38,7 +39,8 @@ help:
 	@${ECHO} ""
 	@${ECHO} "	The special topic :index lists all available topics."
 	@${ECHO} ""
-.else
+.  else
 	${RUN} cd ${PKGSRCDIR};						\
 	env TOPIC=${TOPIC:Q} ${AWK} -f ${PKGSRCDIR}/mk/help/help.awk ${_HELP_FILES}
+.  endif
 .endif
diff --git a/mk/misc/category.mk b/mk/misc/category.mk
index 1a16a11083a..9c927e00703 100644
--- a/mk/misc/category.mk
+++ b/mk/misc/category.mk
@@ -1,6 +1,7 @@
-# $NetBSD: category.mk,v 1.2 2007/10/13 11:04:18 dsl Exp $
+# $NetBSD: category.mk,v 1.3 2018/01/07 11:23:37 rillig Exp $
 #
-# This file contains the variables and targets for category Makefiles.
+# This file contains the variables and targets for category Makefiles,
+# e.g. x11/Makefile.
 #
 
 .include "common.mk"
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index a56b5e5cedf..4e978726e57 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.280 2017/08/01 15:09:52 wiz Exp $
+# $NetBSD: replace.mk,v 1.281 2018/01/07 11:23:37 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -78,6 +78,7 @@
 #
 #	USE_TOOLS+=	perl:run
 #
+# Keywords: USE_TOOLS tool tools
 
 # bison implies "bison-yacc"
 .if !empty(USE_TOOLS:Mbison) || !empty(USE_TOOLS:Mbison\:*)