summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Techet <techet@gmail.com>2019-04-23 19:48:12 +0200
committerJiří Techet <techet@gmail.com>2019-04-23 19:48:12 +0200
commit1ffbaeb0b67878b60f020ddde7a85fcc89f0717f (patch)
treeaa5b3be747dbd9514350c71122920ad37b240d33
parentea3183b1ebb165f4ad4f6841ad5a4ac2597d93a4 (diff)
parent93e971005dd039dbe1b997e1bb37127e37fe6579 (diff)
downloadlibchamplain-1ffbaeb0b67878b60f020ddde7a85fcc89f0717f.tar.gz
Merge branch 'mraudsepp/libchamplain-devhelp-fix'
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--docs/reference/meson.build2
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'),