diff options
| author | Alejandro Colomar <alx.manpages@gmail.com> | 2022-08-28 13:18:54 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx.manpages@gmail.com> | 2022-08-28 14:01:45 +0200 |
| commit | 27d3818d8c6cc64bfdece1633c98e4082f977cdc (patch) | |
| tree | 086dcf99f652047403385a2144415960406d4b07 | |
| parent | f1a71d4a836d48f81832415626d27521854f85c6 (diff) | |
cmd.mk, lint-man.mk: Use MANWIDTH instead of a hardcoded 80
Also need another variable set to MANWIDTH - 2, since troff needs
room for two extra characters for some reason.
Cc: Ralph Corderoy <ralph@inputplus.co.uk>
Cc: "G. Branden Robinson" <g.branden.robinson@gmail.com>
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
| -rw-r--r-- | lib/cmd.mk | 2 | ||||
| -rw-r--r-- | lib/lint-man.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/cmd.mk b/lib/cmd.mk index 662209966..2704cb3d0 100644 --- a/lib/cmd.mk +++ b/lib/cmd.mk @@ -8,6 +8,8 @@ ifndef MAKEFILE_CMD_INCLUDED MAKEFILE_CMD_INCLUDED := 1 +BC := bc +ECHO := echo FIND := find GIT := git GREP := grep diff --git a/lib/lint-man.mk b/lib/lint-man.mk index c4039fff9..df377df04 100644 --- a/lib/lint-man.mk +++ b/lib/lint-man.mk @@ -16,7 +16,9 @@ include $(srcdir)/lib/src.mk TMACDIR := $(SYSCONFDIR)/groff/tmac -TROFF_OUT_DEVICE := ascii +MANWIDTH ?= 80 +TROFF_LINE_LENGTH := $(shell echo $(MANWIDTH)-2 | $(BC)) +TROFF_OUT_DEVICE := ascii TBL := tbl @@ -35,7 +37,7 @@ DEFAULT_TROFFFLAGS += $(foreach x,$(TMACNAMES),-m $(x)) DEFAULT_TROFFFLAGS += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) DEFAULT_TROFFFLAGS += -ww DEFAULT_TROFFFLAGS += -T$(TROFF_OUT_DEVICE) -DEFAULT_TROFFFLAGS += -rLL=80n +DEFAULT_TROFFFLAGS += -rLL=$(TROFF_LINE_LENGTH)n EXTRA_TROFFFLAGS := TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS) TROFF := troff @@ -73,7 +75,7 @@ $(_LINT_man_groff): $(_LINTDIR)/%.lint-man.groff.touch: $(MANDIR)/% | $$(@D)/. | $(TROFF) $(TROFFFLAGS) \ | $(GROTTY) $(GROTTYFLAGS) \ | $(COL) $(COLFLAGS) \ - | (! $(GREP) -n '.\{80\}.') + | (! $(GREP) -n '.\{$(MANWIDTH)\}.') touch $@ $(_LINT_man_mandoc): $(_LINTDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% | $$(@D)/. |