diff options
Diffstat (limited to 'share/mk/build/catman')
-rw-r--r-- | share/mk/build/catman/eqn.mk | 5 | ||||
-rw-r--r-- | share/mk/build/catman/grotty.mk | 4 | ||||
-rw-r--r-- | share/mk/build/catman/troff.mk | 22 |
3 files changed, 16 insertions, 15 deletions
diff --git a/share/mk/build/catman/eqn.mk b/share/mk/build/catman/eqn.mk index 48b6e75..d5796a8 100644 --- a/share/mk/build/catman/eqn.mk +++ b/share/mk/build/catman/eqn.mk @@ -7,8 +7,9 @@ MAKEFILE_BUILD_CATMAN_EQN_INCLUDED := 1 include $(MAKEFILEDIR)/build/pre/tbl.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/eqn.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/nroff.mk _CATMAN_troff := $(patsubst %.eqn,%.cat.troff,$(_MAN_eqn)) diff --git a/share/mk/build/catman/grotty.mk b/share/mk/build/catman/grotty.mk index 7def414..db2ab3d 100644 --- a/share/mk/build/catman/grotty.mk +++ b/share/mk/build/catman/grotty.mk @@ -7,10 +7,10 @@ MAKEFILE_BUILD_CATMAN_GROTTY_INCLUDED := 1 include $(MAKEFILEDIR)/build/catman/troff.mk -include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/grotty.mk -_CATMAN := $(patsubst %.cat.set,%.cat,$(_CATMAN_MAN_set) $(_CATMAN_MDOC_set)) +_CATMAN := $(patsubst %.cat.set, %.cat, $(_CATMAN_MAN_set) $(_CATMAN_MDOC_set)) $(_CATMAN): %.cat: %.cat.set $(MK) | $$(@D)/ diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk index c38ba17..d5dd9d5 100644 --- a/share/mk/build/catman/troff.mk +++ b/share/mk/build/catman/troff.mk @@ -7,12 +7,13 @@ MAKEFILE_BUILD_CATMAN_TROFF_INCLUDED := 1 include $(MAKEFILEDIR)/build/_.mk -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk -include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/build/man/man.mk +include $(MAKEFILEDIR)/build/man/mdoc.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/nroff.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk include $(MAKEFILEDIR)/configure/xfail.mk -include $(MAKEFILEDIR)/src.mk _XFAIL_CATMAN_MAN_set := \ @@ -45,12 +46,11 @@ _XFAIL_CATMAN_MAN_set := \ $(_MANDIR)/man8/zic.8.cat.set +troff_catman_ignore_grep := $(MAKEFILEDIR)/build/catman/troff.ignore.grep -troff_man_ignore_grep := $(MAKEFILEDIR)/build/catman/troff.ignore.grep - -_CATMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MAN)) -_CATMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MDOC)) +_CATMAN_MAN_set := $(patsubst %, %.cat.set, $(_NONSO_MAN)) +_CATMAN_MDOC_set := $(patsubst %, %.cat.set, $(_NONSO_MDOC)) ifeq ($(SKIP_XFAIL),yes) @@ -58,10 +58,10 @@ _CATMAN_MAN_set := $(filter-out $(_XFAIL_CATMAN_MAN_set), $(_CATMAN_MAN_set)) endif -$(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(troff_man_ignore_grep) $(MK) | $$(@D)/ +$(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(troff_catman_ignore_grep) $(MK) | $$(@D)/ $(info $(INFO_)TROFF $@) ! ($(TROFF) -man $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@ \ - | $(GREP) -v -f '$(troff_man_ignore_grep)' \ + | $(GREP) -v -f '$(troff_catman_ignore_grep)' \ || $(TRUE); \ ) \ | $(GREP) ^ >&2 |