From 7f3caba522f4d24764f29d83aa2de9198bb7f01c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 24 May 2024 06:52:22 +0200 Subject: Adding upstream version 6.8. Signed-off-by: Daniel Baumann --- share/mk/build/catman/troff.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'share/mk/build/catman/troff.mk') 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 -- cgit v1.2.3