[pkgsrc/trunk]: pkgsrc/mk All the files in mk/ are searched for helping infor...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83f2fd6f29a6
branches:  trunk
changeset: 519323:83f2fd6f29a6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 01 14:52:32 2006 +0000

description:
All the files in mk/ are searched for helping information.

Variable help texts may also start with the variable name, followed by a
colon.

The help message is more detailed.

diffstat:

 mk/bsd.pkg.help.mk |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r 0c3dedb3e106 -r 83f2fd6f29a6 mk/bsd.pkg.help.mk
--- a/mk/bsd.pkg.help.mk        Sun Oct 01 14:51:03 2006 +0000
+++ b/mk/bsd.pkg.help.mk        Sun Oct 01 14:52:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.help.mk,v 1.4 2006/08/04 07:34:25 rillig Exp $
+# $NetBSD: bsd.pkg.help.mk,v 1.5 2006/10/01 14:52:32 rillig Exp $
 #
 
 # This is the integrated pkgsrc online help system. To query for the
@@ -10,10 +10,7 @@
 _PKGSRC_HELP_MK=       # defined
 
 _HELP_FILES=           # empty
-_HELP_FILES+=          mk/defaults/mk.conf
-_HELP_FILES+=          mk/bsd.prefs.mk
-_HELP_FILES+=          mk/bsd.pkg.mk
-_HELP_FILES+=          mk/bsd.options.mk
+_HELP_FILES+=          mk/*.mk
 _HELP_FILES+=          mk/*/*.mk
 
 _HELP_AWK= \
@@ -38,7 +35,8 @@
                }                                                       \
        }                                                               \
        ($$1 == VARNAME"?=") || ($$1 == "\#"VARNAME"=")                 \
-       || ($$1 == "\#" && $$2 == VARNAME && last_line_was_empty) {     \
+       || ($$1 == "\#" && last_line_was_empty &&                       \
+           ($$2 == VARNAME || $$2 == VARNAME":")) {                    \
                var = 1;                                                \
        }                                                               \
        /^\#/ {                                                         \
@@ -77,7 +75,11 @@
 .PHONY: help
 help:
 .if !defined(TOPIC)
-       @${ECHO} "usage: "${MAKE:Q}" help TOPIC=<VARNAME>" 1>&2
+       @${PRINTF} "usage: %s help topic=<topic>\\n" ${MAKE:Q}
+       @${PRINTF} "\\n"
+       @${PRINTF} "\\t<topic> may be a variable name or a make target,\\n"
+       @${PRINTF} "\\tfor example CONFIGURE_DIRS or patch.\\n"
+       @${PRINTF} "\\n"
 .else
        ${_PKG_SILENT}${_PKG_DEBUG} set -e;                             \
        cd ${PKGSRCDIR};                                                \