diff options
-rw-r--r-- | share/mk/build/catman/troff.ignore.grep (renamed from share/lint/groff/man.ignore.grep) | 0 | ||||
-rw-r--r-- | share/mk/build/catman/troff.mk | 6 | ||||
-rw-r--r-- | share/mk/lint/man/mandoc.ignore.grep (renamed from share/lint/mandoc/man.ignore.grep) | 0 | ||||
-rw-r--r-- | share/mk/lint/man/mandoc.mk | 2 | ||||
-rw-r--r-- | share/mk/lint/mdoc/mandoc.ignore.grep (renamed from share/lint/mandoc/mdoc.ignore.grep) | 0 | ||||
-rw-r--r-- | share/mk/lint/mdoc/mandoc.mk | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/share/lint/groff/man.ignore.grep b/share/mk/build/catman/troff.ignore.grep index 912eb576c..912eb576c 100644 --- a/share/lint/groff/man.ignore.grep +++ b/share/mk/build/catman/troff.ignore.grep diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk index 7d302b83c..c38ba17c7 100644 --- a/share/mk/build/catman/troff.mk +++ b/share/mk/build/catman/troff.mk @@ -46,7 +46,7 @@ _XFAIL_CATMAN_MAN_set := \ -groff_man_ignore_grep := $(DATAROOTDIR)/lint/groff/man.ignore.grep +troff_man_ignore_grep := $(MAKEFILEDIR)/build/catman/troff.ignore.grep _CATMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MAN)) @@ -58,10 +58,10 @@ _CATMAN_MAN_set := $(filter-out $(_XFAIL_CATMAN_MAN_set), $(_CATMAN_MAN_set)) endif -$(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(groff_man_ignore_grep) $(MK) | $$(@D)/ +$(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(troff_man_ignore_grep) $(MK) | $$(@D)/ $(info $(INFO_)TROFF $@) ! ($(TROFF) -man $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@ \ - | $(GREP) -v -f '$(groff_man_ignore_grep)' \ + | $(GREP) -v -f '$(troff_man_ignore_grep)' \ || $(TRUE); \ ) \ | $(GREP) ^ >&2 diff --git a/share/lint/mandoc/man.ignore.grep b/share/mk/lint/man/mandoc.ignore.grep index a2f91bcff..a2f91bcff 100644 --- a/share/lint/mandoc/man.ignore.grep +++ b/share/mk/lint/man/mandoc.ignore.grep diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk index 6210c83c2..efa69ab11 100644 --- a/share/mk/lint/man/mandoc.mk +++ b/share/mk/lint/man/mandoc.mk @@ -33,7 +33,7 @@ _LINT_man_mandoc := $(filter-out $(_XFAIL_LINT_man_mandoc), $(_LINT_man_mandoc)) endif -mandoc_man_ignore_grep := $(DATAROOTDIR)/lint/mandoc/man.ignore.grep +mandoc_man_ignore_grep := $(MAKEFILEDIR)/lint/man/mandoc.ignore.grep $(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_man_ignore_grep) $(MK) | $$(@D)/ diff --git a/share/lint/mandoc/mdoc.ignore.grep b/share/mk/lint/mdoc/mandoc.ignore.grep index 4c73c592b..4c73c592b 100644 --- a/share/lint/mandoc/mdoc.ignore.grep +++ b/share/mk/lint/mdoc/mandoc.ignore.grep diff --git a/share/mk/lint/mdoc/mandoc.mk b/share/mk/lint/mdoc/mandoc.mk index 7fc38e6ba..8b209b89c 100644 --- a/share/mk/lint/mdoc/mandoc.mk +++ b/share/mk/lint/mdoc/mandoc.mk @@ -14,7 +14,7 @@ include $(MAKEFILEDIR)/lint/mdoc/_.mk include $(MAKEFILEDIR)/src.mk -mandoc_mdoc_ignore_grep := $(DATAROOTDIR)/lint/mandoc/mdoc.ignore.grep +mandoc_mdoc_ignore_grep := $(MAKEFILEDIR)/lint/mdoc/mandoc.ignore.grep $(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% $(mandoc_mdoc_ignore_grep) | $$(@D)/ |