From 0db324e2e5d9d3347ea0e93138372fb65aac09e6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 21:41:09 +0200
Subject: Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/mk/install/html.mk | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'share/mk/install/html.mk')

diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index 97e00ce..047df90 100644
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -1,28 +1,27 @@
-########################################################################
-# Copyright 2021-2022, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
 ifndef MAKEFILE_INSTALL_HTML_INCLUDED
 MAKEFILE_INSTALL_HTML_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/html.mk
+include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/html/post-grohtml.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
+include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/install/_.mk
 
 
-htmldir  := $(docdir)
-htmldir_ := $(htmldir)/man
-_htmldir := $(DESTDIR)$(htmldir_)
+_htmldir := $(DESTDIR)$(htmldir)
 
 
-_htmlpages      := $(patsubst $(_HTMLDIR)/%,$(_htmldir)/%,$(_HTMLPAGES))
+_htmlpages      := $(patsubst $(_MANDIR)/%,$(_htmldir)/%,$(_HTMLMAN))
 _htmlpages_rm   := $(addsuffix -rm,$(wildcard $(_htmlpages)))
 
 
-$(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% | $$(@D)/
-	$(info INSTALL	$@)
+$(_htmlpages): $(_htmldir)/%: $(_MANDIR)/% $(MK) | $$(@D)/
+	$(info	$(INFO_)INSTALL		$@)
 	$(INSTALL_DATA) -T $< $@
 
 
-- 
cgit v1.2.3