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/html/post-grohtml.mk | 4 ++-- share/mk/build/html/troff.mk | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'share/mk/build/html') diff --git a/share/mk/build/html/post-grohtml.mk b/share/mk/build/html/post-grohtml.mk index fe77776..26effbb 100644 --- a/share/mk/build/html/post-grohtml.mk +++ b/share/mk/build/html/post-grohtml.mk @@ -7,10 +7,10 @@ MAKEFILE_BUILD_HTML_POST_GROHTML_INCLUDED := 1 include $(MAKEFILEDIR)/build/html/troff.mk -include $(MAKEFILEDIR)/configure/build-depends/groff.mk +include $(MAKEFILEDIR)/configure/build-depends/groff/post-grohtml.mk -_HTMLMAN := $(patsubst %.html.set,%.html,$(_HTMLMAN_MAN_set) $(_HTMLMAN_MDOC_set)) +_HTMLMAN := $(patsubst %.html.set, %.html, $(_HTMLMAN_MAN_set) $(_HTMLMAN_MDOC_set)) $(_HTMLMAN): %.html: %.html.set $(MK) | $$(@D)/ diff --git a/share/mk/build/html/troff.mk b/share/mk/build/html/troff.mk index 010c211..9b6f1fd 100644 --- a/share/mk/build/html/troff.mk +++ b/share/mk/build/html/troff.mk @@ -7,16 +7,18 @@ MAKEFILE_BUILD_HTML_TROFF_INCLUDED := 1 include $(MAKEFILEDIR)/build/_.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/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk include $(MAKEFILEDIR)/configure/xfail.mk -include $(MAKEFILEDIR)/src.mk _XFAIL_HTMLMAN_MAN_set := \ $(_MANDIR)/man2/fanotify_init.2.html.set \ + $(_MANDIR)/man2/mbind.2.html.set \ $(_MANDIR)/man2/membarrier.2.html.set \ + $(_MANDIR)/man2/set_mempolicy.2.html.set \ $(_MANDIR)/man5/proc.5.html.set \ $(_MANDIR)/man7/bpf-helpers.7.html.set \ $(_MANDIR)/man7/charsets.7.html.set \ @@ -25,8 +27,8 @@ _XFAIL_HTMLMAN_MAN_set := \ $(_MANDIR)/man8/zic.8.html.set -_HTMLMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.html.set,$(NONSO_MAN)) -_HTMLMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.html.set,$(NONSO_MDOC)) +_HTMLMAN_MAN_set := $(patsubst %, %.html.set, $(_NONSO_MAN)) +_HTMLMAN_MDOC_set := $(patsubst %, %.html.set, $(_NONSO_MDOC)) ifeq ($(SKIP_XFAIL),yes) -- cgit v1.2.3