diff options
| author | Alejandro Colomar <alx@kernel.org> | 2023-04-28 15:00:33 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2023-04-28 15:00:35 +0200 |
| commit | f78f5c9a747a296c92ad246e783111285bfa588c (patch) | |
| tree | fef394fabc404bea720c847d1895573d72ceb6e8 | |
| parent | 7fe823ea628e86c08e551a42a2c26e29c5d8c725 (diff) | |
*.mk: Move -rCHECKSTYLE to NROFFFLAGS
Having that in TROFFFLAGS caused repeated warnings for every different
format we produce. Let's have these warnings only in nroff mode.
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | share/mk/build/catman.mk | 14 | ||||
| -rw-r--r-- | share/mk/build/groff.mk | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/share/mk/build/catman.mk b/share/mk/build/catman.mk index de494c3f3..52be54c6c 100644 --- a/share/mk/build/catman.mk +++ b/share/mk/build/catman.mk @@ -14,14 +14,16 @@ include $(MAKEFILEDIR)/cmd.mk include $(MAKEFILEDIR)/src.mk -MANWIDTH ?= 80 -NROFF_LINE_LENGTH := $(shell $(EXPR) $(MANWIDTH) - 2) -NROFF_OUT_DEVICE := $(shell $(LOCALE) charmap \ - | $(GREP) -i 'utf-*8' >/dev/null \ - && $(ECHO) utf8 \ - || $(ECHO) ascii) +MANWIDTH ?= 80 +TROFF_CHECKSTYLE_LVL := 3 +NROFF_LINE_LENGTH := $(shell $(EXPR) $(MANWIDTH) - 2) +NROFF_OUT_DEVICE := $(shell $(LOCALE) charmap \ + | $(GREP) -i 'utf-*8' >/dev/null \ + && $(ECHO) utf8 \ + || $(ECHO) ascii) DEFAULT_NROFFFLAGS := -rLL=$(NROFF_LINE_LENGTH)n +DEFAULT_NROFFFLAGS += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) EXTRA_NROFFFLAGS := NROFFFLAGS := $(DEFAULT_NROFFFLAGS) $(EXTRA_NROFFFLAGS) diff --git a/share/mk/build/groff.mk b/share/mk/build/groff.mk index 63afcd825..63162f16e 100644 --- a/share/mk/build/groff.mk +++ b/share/mk/build/groff.mk @@ -23,10 +23,8 @@ EXTRA_TROFFFLAGS := TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS) TROFF := troff -TROFF_CHECKSTYLE_LVL := 3 DEFAULT_TROFFFLAGS_MAN := $(TROFFFLAGS) DEFAULT_TROFFFLAGS_MAN += -man -DEFAULT_TROFFFLAGS_MAN += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) EXTRA_TROFFFLAGS_MAN := TROFFFLAGS_MAN := $(DEFAULT_TROFFFLAGS_MAN) $(EXTRA_TROFFFLAGS_MAN) |