From a82c3c3dafa4a279ba92554259d663da9537da02 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 13 Dec 2007 11:48:38 +0000
Subject: Made "bmake show-help topic=show-var" (and probably some others) work
 again.

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

(limited to 'mk/help')

diff --git a/mk/help/help.awk b/mk/help/help.awk
index 46ba9bf4ca7..25f1ac12d48 100644
--- a/mk/help/help.awk
+++ b/mk/help/help.awk
@@ -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 @@ BEGIN {
 }
 
 # 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 @@ NF >= 1 {
 
 	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;
 	}
 }
-- 
cgit v1.2.3