diff options
| author | Alejandro Colomar <alx@kernel.org> | 2023-04-28 15:32:07 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2023-04-28 15:33:08 +0200 |
| commit | 53e9c8e4a1492c1f9d7164612a1f62720d8a4af2 (patch) | |
| tree | 64b8b393f9c38473404c39184eab5b4b474bc033 | |
| parent | f78f5c9a747a296c92ad246e783111285bfa588c (diff) | |
*.mk: Move -T$NROFF_OUT_DEVICE into NROFFFLAGS
This avoids breaking some long lines.
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | share/mk/build/catman.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/share/mk/build/catman.mk b/share/mk/build/catman.mk index 52be54c6c..771f8b7d1 100644 --- a/share/mk/build/catman.mk +++ b/share/mk/build/catman.mk @@ -22,7 +22,8 @@ NROFF_OUT_DEVICE := $(shell $(LOCALE) charmap \ && $(ECHO) utf8 \ || $(ECHO) ascii) -DEFAULT_NROFFFLAGS := -rLL=$(NROFF_LINE_LENGTH)n +DEFAULT_NROFFFLAGS := -T$(NROFF_OUT_DEVICE) +DEFAULT_NROFFFLAGS += -rLL=$(NROFF_LINE_LENGTH)n DEFAULT_NROFFFLAGS += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) EXTRA_NROFFFLAGS := NROFFFLAGS := $(DEFAULT_NROFFFLAGS) $(EXTRA_NROFFFLAGS) @@ -46,14 +47,12 @@ $(_CATMAN_troff): %.cat.troff: %.eqn | $$(@D)/ $(_CATMAN_MAN_set): %.cat.set: %.cat.troff | $$(@D)/ $(info TROFF $@) - <$< 2>&1 >$@ \ - $(TROFF) -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MAN) $(NROFFFLAGS) \ + $(TROFF) $(TROFFFLAGS_MAN) $(NROFFFLAGS) <$< 2>&1 >$@ \ | ( ! $(GREP) ^ ) >&2 $(_CATMAN_MDOC_set): %.cat.set: %.cat.troff | $$(@D)/ $(info TROFF $@) - <$< 2>&1 >$@ \ - $(TROFF) -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MDOC) $(NROFFFLAGS) \ + $(TROFF) $(TROFFFLAGS_MDOC) $(NROFFFLAGS) <$< 2>&1 >$@ \ | ( ! $(GREP) ^ ) >&2 $(_CATMAN): %.cat: %.cat.set | $$(@D)/ |