Skip to content

Commit c49a67b

Browse files
committed
docs/man/index.txt, docs/man/Makefile.am, docs/man/.gitignore: report the effect of DOC_INSTALL_SELECTED_MANS_PROGS_BUILT on delivered docs and indexed man pages
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
1 parent 07ea4cc commit c49a67b

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

docs/man/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/tmp/
1212
/linkman-driver-names.txt
1313
/linkman-drivertool-names.txt
14+
/linkman-docbuildmode-note.txt
1415
/linkman-*.txt.tmp
1516
/.check-html-man
1617
/.check-man-pages

docs/man/Makefile.am

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ endif !WITH_HTML_SINGLE
15851585
# To regenerate these files, you may have to `make distclean` first
15861586
# FIXME: Track also clients (e.g. NUT-Monitor UI, etc.), development-only tools
15871587
# (sockdebug), or platform-specific progs (nut.exe)
1588-
LINKMAN_INCLUDE_GENERATED = linkman-driver-names.txt linkman-drivertool-names.txt
1588+
LINKMAN_INCLUDE_GENERATED = linkman-driver-names.txt linkman-drivertool-names.txt linkman-docbuildmode-note.txt
15891589
LINKMAN_INCLUDE_CONSUMERS = index.txt upsd.txt nutupsdrv.txt nut.txt
15901590
CLEANFILES = linkman-*.txt.tmp
15911591

@@ -1636,9 +1636,38 @@ linkman-drivertool-names.txt: Makefile
16361636
rm -f "$(builddir)/$(@F).tmp" ; \
16371637
fi
16381638

1639+
# Doing this dynamically as here, so we may later deliver some more dynamic
1640+
# content if desired (e.g. lists of built/not-built programs, date, version,
1641+
# etc.). Or maybe not, we'll see :)
1642+
if DOC_INSTALL_SELECTED_MANS_PROGS_BUILT
1643+
1644+
linkman-docbuildmode-note.txt: Makefile
1645+
@echo " GENERATE-LINKMAN $@"
1646+
@( echo 'NOTE: This build of NUT was configured to deliver only manual pages for programs that were actually built. For more information about the ecosystem please see '; \
1647+
echo 'ifndef::website[]' ; \
1648+
echo 'the NUT website listing at https://networkupstools.org/docs/man/index.html or ' ; \
1649+
echo 'endif::website[]' ; \
1650+
echo 'the sources of these pages at https://github.com/networkupstools/nut/tree/master/docs/man'; \
1651+
) > "$(builddir)/$(@F)"
1652+
1653+
else !DOC_INSTALL_SELECTED_MANS_PROGS_BUILT
1654+
1655+
linkman-docbuildmode-note.txt: Makefile
1656+
@echo " GENERATE-LINKMAN $@"
1657+
@( echo 'NOTE: This build of NUT was configured to deliver all available manual'; \
1658+
echo 'ifndef::website[]' ; \
1659+
echo 'pages, and may include those for programs that were not actually built or installed.' ; \
1660+
echo 'endif::website[]' ; \
1661+
echo 'ifdef::website[]' ; \
1662+
echo 'pages.' ; \
1663+
echo 'endif::website[]' ; \
1664+
) > "$(builddir)/$(@F)"
1665+
1666+
endif !DOC_INSTALL_SELECTED_MANS_PROGS_BUILT
1667+
16391668
# Dependencies are about particular filenames, since over time
16401669
# we might have several use-cases for LINKMAN_INCLUDE_GENERATED:
1641-
$(LINKMAN_INCLUDE_CONSUMERS): linkman-driver-names.txt linkman-drivertool-names.txt
1670+
$(LINKMAN_INCLUDE_CONSUMERS): linkman-driver-names.txt linkman-drivertool-names.txt linkman-docbuildmode-note.txt
16421671

16431672
# These files are generated when we build from git source so not tracked in
16441673
# git, and not part of tarball (to be in builddir) - so not in EXTRA_DIST.

docs/man/index.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ endif::website[]
77
User manual pages
88
-----------------
99

10+
include::{builddir}linkman-docbuildmode-note.txt[]
11+
1012
ifndef::in-nut-manpage[]
1113
NUT overview
1214
~~~~~~~~~~~~

docs/nut.dict

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 3519 utf-8
1+
personal_ws-1.1 en 3520 utf-8
22
AAC
33
AAS
44
ABI
@@ -1940,6 +1940,7 @@ dnf
19401940
dnl
19411941
dnsmasq
19421942
docbook
1943+
docbuildmode
19431944
docdir
19441945
docinfo
19451946
docs

0 commit comments

Comments
 (0)