[libchamplain: 3/8] meson: Fix gtk-doc module name
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain: 3/8] meson: Fix gtk-doc module name
- Date: Tue, 23 Apr 2019 17:57:07 +0000 (UTC)
commit 93e971005dd039dbe1b997e1bb37127e37fe6579
Author: Mart Raudsepp <leio gentoo org>
Date: Tue Mar 19 09:19:54 2019 +0200
meson: Fix gtk-doc module name
gtk-docs get installed into API versioned subdir (for being able to
parallel-install with past and potential future API versions), but
unversioned package_name is passed to gnome.gtkdoc. This results in
/usr/share/gtk-doc/html/champlain-0.12/champlain.devhelp2 being
installed, which the devhelp tool ignores. The devhelp file needs to
be named the same as the subdir for it to be picked up, thus use
package_string instead of package_name as gtkdoc positional argument
to fix it.
.gitlab-ci.yml | 2 +-
docs/reference/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a60637e..9f68909 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ build-champlain:
- meson -Dwidgetry=true -Ddemos=true -Dgtk_doc=true -Dintrospection=true -Dvapi=true _build .
- ninja -C _build
- ninja -C _build test
- - ninja -C _build champlain-doc
+ - ninja -C _build champlain-0.12-doc
- ccache --show-stats
artifacts:
name: "champlain-doc"
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 781205a..8642ed5 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -61,7 +61,7 @@ libchamplain_reference_fixxref_args = [
]
gnome.gtkdoc(
- package_name,
+ package_string,
main_xml: 'champlain-docs.xml',
mode: 'xml',
gobject_typesfile: files('champlain.types'),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]