*.mk: TROFFFLAGS{_MAN,_MDOC}: Include -man/-mdoc in the flags variables

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/share/mk/build/catman.mk b/share/mk/build/catman.mk
index 01c3874fdb0aeaad3a9a611a3eba4bf1280bffd7..39d8bc90f0e0b885ee54d727256aa320aae3d0ff 100644 (file)
--- a/share/mk/build/catman.mk
+++ b/share/mk/build/catman.mk
@@ -45,13 +45,13 @@ $(_CATMAN_troff): %.cat.troff: %.eqn | $$(@D)/
 $(_CATMAN_MAN_set): %.cat.set: %.cat.troff | $$(@D)/
        $(info  TROFF   $@)
        <$< 2>&1 >$@ \
-       $(TROFF) -man -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MAN) $(NROFFFLAGS) \
+       $(TROFF) -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MAN) $(NROFFFLAGS) \
        | ( ! $(GREP) ^ )
 
 $(_CATMAN_MDOC_set): %.cat.set: %.cat.troff | $$(@D)/
        $(info  TROFF   $@)
        <$< 2>&1 >$@ \
-       $(TROFF) -mdoc -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MDOC) $(NROFFFLAGS) \
+       $(TROFF) -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MDOC) $(NROFFFLAGS) \
        | ( ! $(GREP) ^ )
 
 $(_CATMAN): %.cat: %.cat.set | $$(@D)/

diff --git a/share/mk/build/groff.mk b/share/mk/build/groff.mk
index 7a3bfcba81bee4888a85b58e0e18203de729bb22..e2872b470df6f4224f9824f477a02d05b94adacb 100644 (file)
--- a/share/mk/build/groff.mk
+++ b/share/mk/build/groff.mk
@@ -28,6 +28,7 @@ TROFF                := troff
 
 TROFF_CHECKSTYLE_LVL   := 3
 DEFAULT_TROFFFLAGS_MAN := $(TROFFFLAGS)
+DEFAULT_TROFFFLAGS_MAN += -man
 DEFAULT_TROFFFLAGS_MAN += -M $(TMACDIR)
 DEFAULT_TROFFFLAGS_MAN += -m checkstyle
 DEFAULT_TROFFFLAGS_MAN += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL)
@@ -35,6 +36,7 @@ EXTRA_TROFFFLAGS_MAN   :=
 TROFFFLAGS_MAN         := $(DEFAULT_TROFFFLAGS_MAN) $(EXTRA_TROFFFLAGS_MAN)
 
 DEFAULT_TROFFFLAGS_MDOC := $(TROFFFLAGS)
+DEFAULT_TROFFFLAGS_MDOC += -mdoc
 EXTRA_TROFFFLAGS_MDOC   :=
 TROFFFLAGS_MDOC         := $(DEFAULT_TROFFFLAGS_MDOC) $(EXTRA_TROFFFLAGS_MDOC)