[pkgsrc/trunk]: pkgsrc/mk/help Made "bmake show-help topic=show-var" (and pro...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f19a606241fc
branches:  trunk
changeset: 536432:f19a606241fc
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Dec 13 11:48:38 2007 +0000

description:
Made "bmake show-help topic=show-var" (and probably some others) work
again.

diffstat:

 mk/help/help.awk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r d4f545807968 -r f19a606241fc mk/help/help.awk
--- a/mk/help/help.awk  Thu Dec 13 11:17:19 2007 +0000
+++ b/mk/help/help.awk  Thu Dec 13 11:48:38 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: help.awk,v 1.17 2007/11/13 16:52:39 rillig Exp $
+# $NetBSD: help.awk,v 1.18 2007/12/13 11:48:38 rillig Exp $
 #
 
 # This program extracts the inline documentation from *.mk files.
@@ -27,7 +27,7 @@
 }
 
 # Help topics are separated by either completely empty lines or by the
-# end of a file or by the end of all files. When here have been enough
+# end of a file or by the end of all files. When there have been enough
 # comment lines, the topic is considered worth printing.
 #
 function end_of_topic() {
@@ -109,13 +109,13 @@
 
        this_line_is_definition = (w1 == toupper($1)) && (w2 == toupper($2));
 
+       w = (w1 == "#") ? w2 : w1;
        if ((w1 == uctopic"?=") ||
            (w1 == uctopic"=") ||
            (index(w1, "#"uctopic"=") == 1) ||
            (index(w1, "#"uctopic"?=") == 1) ||
            (this_line_maybe_definition &&
-               w1 == "#" &&
-               (w2 == uctopic || w2 == uctopic":"))) {
+               (w == uctopic || w == uctopic":"))) {
                relevant = yes;
        }
 }