summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <mail@jensge.org>2022-11-07 13:15:24 +0100
committerJens Georg <mail@jensge.org>2022-11-07 13:15:24 +0100
commitc961f9d7208c2b857a09c3aa13bd53711b2b08d5 (patch)
tree22399250e8eac63b3c05466ee6855dc34eb0d5ad
parent19ccc6560869e6ffe496d56e2b2e54a644483f97 (diff)
downloadgupnp-c961f9d7208c2b857a09c3aa13bd53711b2b08d5.tar.gz
build,ci: Fix documentation install path
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--doc/meson.build4
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0335634..b13b458 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,9 +230,9 @@ pages:
stage: website
script:
- meson doc-build -Dgtk_doc=true
- - ninja -C doc-build doc/GUPnP
+ - ninja -C doc-build doc/gupnp-1.6
- mkdir -p public
- - mv doc-build/doc/GUPnP public/docs
+ - mv doc-build/doc/gupnp-1.6 public/docs
artifacts:
paths:
- public
diff --git a/doc/meson.build b/doc/meson.build
index c227112..607cd30 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -21,7 +21,7 @@ if get_option('gtk_doc')
configuration: entities
)
- docs_dir = join_paths(get_option('prefix'), get_option('datadir')) / 'doc' / GUPNP_API_NAME / 'reference'
+ docs_dir = join_paths(get_option('prefix'), get_option('datadir'), 'doc')
if gssdp_dep.type_name() == 'internal'
gssdp_gir_dirs = subproject('gssdp-1.6').get_variable('gssdp_gir_dir')
@@ -32,7 +32,7 @@ if get_option('gtk_doc')
custom_target(
'gupnp-doc',
input: [ gupnp_toml, gir[0] ],
- output: 'GUPnP',
+ output: GUPNP_API_NAME,
command : [
gidocgen,
'generate',