Sun Mar 11 14:50:49 2018 UTC ()
mk/help: run "make help" through the pager by default


(rillig)
diff -r1.14 -r1.15 pkgsrc/mk/help/help.mk
cvs diff -r1.14 -r1.15 pkgsrc/mk/help/help.mk (expand / switch to unified diff)

--- pkgsrc/mk/help/help.mk 2018/01/07 11:23:37 1.14
+++ pkgsrc/mk/help/help.mk 2018/03/11 14:50:49 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: help.mk,v 1.14 2018/01/07 11:23:37 rillig Exp $ 1# $NetBSD: help.mk,v 1.15 2018/03/11 14:50:49 rillig Exp $
2# 2#
3 3
4# This is the integrated pkgsrc online help system. To query for the 4# This is the integrated pkgsrc online help system. To query for the
5# meaning of a variable, run "make help TOPIC=VARNAME". All variables from 5# meaning of a variable, run "make help TOPIC=VARNAME". All variables from
6# certain pkgsrc Makefile fragments that have inline comments are eligible 6# certain pkgsrc Makefile fragments that have inline comments are eligible
7# for querying. 7# for querying.
8 8
9_HELP_FILES= Makefile 9_HELP_FILES= Makefile
10_HELP_FILES+= mk/*.mk mk/*/*.mk mk/*/*/*.mk 10_HELP_FILES+= mk/*.mk mk/*/*.mk mk/*/*/*.mk
11_HELP_FILES+= mk/defaults/mk.conf 11_HELP_FILES+= mk/defaults/mk.conf
12_HELP_FILES+= lang/go/*.mk 12_HELP_FILES+= lang/go/*.mk
13_HELP_FILES+= lang/perl5/*.mk lang/php/*.mk lang/python/*.mk 13_HELP_FILES+= lang/perl5/*.mk lang/php/*.mk lang/python/*.mk
14_HELP_FILES+= lang/ruby/*.mk 14_HELP_FILES+= lang/ruby/*.mk
@@ -31,16 +31,17 @@ help: @@ -31,16 +31,17 @@ help:
31. if !defined(TOPIC) 31. if !defined(TOPIC)
32 @${ECHO} "usage: "${MAKE:Q}" help topic=<topic>" 32 @${ECHO} "usage: "${MAKE:Q}" help topic=<topic>"
33 @${ECHO} "" 33 @${ECHO} ""
34 @${ECHO} " <topic> may be a variable name or a make target," 34 @${ECHO} " <topic> may be a variable name or a make target,"
35 @${ECHO} " for example CONFIGURE_DIRS or patch." 35 @${ECHO} " for example CONFIGURE_DIRS or patch."
36 @${ECHO} "" 36 @${ECHO} ""
37 @${ECHO} " For convenience, all-uppercase topics such as variable" 37 @${ECHO} " For convenience, all-uppercase topics such as variable"
38 @${ECHO} " names may also be given in all-lowercase." 38 @${ECHO} " names may also be given in all-lowercase."
39 @${ECHO} "" 39 @${ECHO} ""
40 @${ECHO} " The special topic :index lists all available topics." 40 @${ECHO} " The special topic :index lists all available topics."
41 @${ECHO} "" 41 @${ECHO} ""
42. else 42. else
43 ${RUN} cd ${PKGSRCDIR}; \ 43 ${RUN} cd ${PKGSRCDIR}; \
44 env TOPIC=${TOPIC:Q} ${AWK} -f ${PKGSRCDIR}/mk/help/help.awk ${_HELP_FILES} 44 env TOPIC=${TOPIC:Q} ${AWK} -f ${PKGSRCDIR}/mk/help/help.awk ${_HELP_FILES} \
 45 | $${PAGER:-cat}
45. endif 46. endif
46.endif 47.endif