From 3d08cd331c1adcf0d917392f7e527b3f00511748 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 24 May 2024 06:52:22 +0200 Subject: Merging upstream version 6.8. Signed-off-by: Daniel Baumann --- share/mk/lint/man/mandoc.mk | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'share/mk/lint/man/mandoc.mk') diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk index efa69ab..2a3f914 100644 --- a/share/mk/lint/man/mandoc.mk +++ b/share/mk/lint/man/mandoc.mk @@ -7,13 +7,12 @@ MAKEFILE_LINT_MAN_MANDOC_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/mandoc.mk -include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/build/man/man.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/mandoc/mandoc.mk include $(MAKEFILEDIR)/configure/xfail.mk -include $(MAKEFILEDIR)/lint/man/_.mk -include $(MAKEFILEDIR)/src.mk _XFAIL_LINT_man_mandoc := \ @@ -26,8 +25,7 @@ _XFAIL_LINT_man_mandoc := \ $(_MANDIR)/man8/zic.8.lint-man.mandoc.touch -_LINT_man_mandoc := \ - $(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.mandoc.touch, $(NONSO_MAN)) +_LINT_man_mandoc := $(patsubst %, %.lint-man.mandoc.touch, $(_NONSO_MAN)) ifeq ($(SKIP_XFAIL),yes) _LINT_man_mandoc := $(filter-out $(_XFAIL_LINT_man_mandoc), $(_LINT_man_mandoc)) endif @@ -36,7 +34,7 @@ endif 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)/ +$(_LINT_man_mandoc): %.lint-man.mandoc.touch: % $(mandoc_man_ignore_grep) $(MK) | $$(@D)/ $(info $(INFO_)MANDOC $@) ! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \ | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \ -- cgit v1.2.3