From 340aedc0d954243e8fec59b3efea84577790135e Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 5 Mar 2023 08:55:10 -0500 Subject: hotdoc: Install devhelp files at the right location When devhelp is enabled, hotdoc generates a devhelp/ subdir that needs to be installed to /usr/share/devhelp/. Otherwise, the html/ subdir needs to be installed to /usr/share/doc//html/ --- mesonbuild/modules/hotdoc.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules/hotdoc.py') diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py index c0a572a..ad5ae30 100644 --- a/mesonbuild/modules/hotdoc.py +++ b/mesonbuild/modules/hotdoc.py @@ -339,9 +339,22 @@ class HotdocTargetBuilder: install_script = None if install: + datadir = os.path.join(self.state.get_option('prefix'), self.state.get_option('datadir')) + devhelp = self.kwargs.get('devhelp_activate', False) + if not isinstance(devhelp, bool): + FeatureDeprecated.single_use('hotdoc.generate_doc() devhelp_activate must be boolean', '1.1.0', self.state.subproject) + devhelp = False + if devhelp: + install_from = os.path.join(fullname, 'devhelp') + install_to = os.path.join(datadir, 'devhelp') + else: + install_from = os.path.join(fullname, 'html') + install_to = os.path.join(datadir, 'doc', self.name, 'html') + install_script = self.state.backend.get_executable_serialisation(self.build_command + [ "--internal", "hotdoc", - "--install", os.path.join(fullname, 'html'), + "--install", install_from, + "--docdir", install_to, '--name', self.name, '--builddir', os.path.join(self.builddir, self.subdir)] + self.hotdoc.get_command() + -- cgit v1.1