From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org>
To: linux-modules@vger.kernel.org
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Subject: [PATCH kmod 10/20] man: stop removing DISTCONFDIR lines
Date: Tue, 11 Jun 2024 16:05:10 +0100 [thread overview]
Message-ID: <20240611-man-v1-10-bd6864d49639@gmail.com> (raw)
In-Reply-To: <20240611-man-v1-0-bd6864d49639@gmail.com>
From: Emil Velikov <emil.l.velikov@gmail.com>
Presently when DISTCONFDIR is identical to /lib we remove the whole
line, since the man pages already have an /lib instance.
At the same time, there are in-text DISTCONFDIR entries, and removing
the whole line outright breaks the documentation.
Drop the removal line - worst case scenario we get a duplicate entry in
the synopsis.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
man/Makefile.am | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/man/Makefile.am b/man/Makefile.am
index 0285fdd..25135e9 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -14,11 +14,8 @@ EXTRA_DIST = $(MAN5:%.5=%.5.scd) $(MAN8:%.8=%.8.scd)
CLEANFILES = $(dist_man_MANS)
define generate_manpage
- $(AM_V_SCDOC)if [ '$(distconfdir)' != '/lib' ] ; then \
- sed -e 's|@DISTCONFDIR@|$(distconfdir)|g' $< ; \
- else \
- sed -e '/@DISTCONFDIR@/d' $< ; \
- fi | \
+ $(AM_V_SCDOC)cat $< | \
+ sed -e 's|@DISTCONFDIR@|$(distconfdir)|g' | \
sed -e 's|@MODULE_DIRECTORY@|$(module_directory)|g' | \
$(SCDOC) > $@
endef
--
2.45.0
next prev parent reply other threads:[~2024-06-11 15:05 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-11 15:05 [PATCH kmod 00/20] man: convert to scdoc and minor improvements Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 01/20] man: add script to generate/compare the xslt vs upcoming scdoc Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 02/20] man: add scdoc based man pages Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 03/20] man: build the " Emil Velikov via B4 Relay
2024-06-29 18:04 ` Lucas De Marchi
2024-07-03 22:05 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 04/20] man: remove no longer used XML files Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 05/20] man: add some extra bold/italic annotations Emil Velikov via B4 Relay
2024-06-28 22:27 ` Lucas De Marchi
2024-06-28 22:32 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 06/20] man: white space fixes Emil Velikov via B4 Relay
2024-06-28 22:30 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 07/20] man: misc punctuation fixes Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 08/20] man: some options take an argument, mention that Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 09/20] man: couple of grammar/language fixes Emil Velikov via B4 Relay
2024-06-11 15:05 ` Emil Velikov via B4 Relay [this message]
2024-06-11 15:05 ` [PATCH kmod 11/20] man: depmod.d: document the config file order handling Emil Velikov via B4 Relay
2024-06-29 17:26 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 12/20] man: depmod.d: factor out a CONFIGURATION FORMAT section Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 13/20] man: depmod.d: rework the opening description sentence Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 14/20] man: depmod: remove hard-coded /etc/depmod.d references Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 15/20] man: modprobe.d: document the config file order handling Emil Velikov via B4 Relay
2024-06-28 22:55 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 16/20] man: modprobe.d: factor out a CONFIGURATION FORMAT section Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 17/20] man: modprobe.d: mention about MODPROBE_OPTIONS Emil Velikov via B4 Relay
2024-06-29 17:13 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 18/20] man: modprobe: remove hard-coded /etc/modprobe.d references Emil Velikov via B4 Relay
2024-06-11 15:05 ` [PATCH kmod 19/20] man: remove the "Maintained by" references Emil Velikov via B4 Relay
2024-06-29 17:51 ` Lucas De Marchi
2024-06-11 15:05 ` [PATCH kmod 20/20] man: list options one per line Emil Velikov via B4 Relay
2024-06-29 18:08 ` [PATCH kmod 00/20] man: convert to scdoc and minor improvements Lucas De Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240611-man-v1-10-bd6864d49639@gmail.com \
--to=devnull+emil.l.velikov.gmail.com@kernel.org \
--cc=emil.l.velikov@gmail.com \
--cc=linux-modules@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).