[glib/glib-2-58: 34/55] Meson: doc: fix cross references
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-58: 34/55] Meson: doc: fix cross references
- Date: Fri, 19 Oct 2018 13:40:23 +0000 (UTC)
commit 2c5bc252dd51ee7e8c89fc2171cc00d5cbd6b8f1
Author: Xavier Claessens <xavier claessens collabora com>
Date: Sun Sep 23 16:01:48 2018 -0400
Meson: doc: fix cross references
docs/reference/gio/meson.build | 4 ++--
docs/reference/glib/meson.build | 1 -
docs/reference/gobject/meson.build | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index c7ca62abb..f1880cc0c 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -221,8 +221,8 @@ if get_option('gtk_doc')
],
fixxref_args: [
'--html-dir=' + docpath,
- '--extra-dir=' + join_paths(meson.current_build_dir(), '../glib/html'),
- '--extra-dir=' + join_paths(meson.current_build_dir(), '../gobject/html'),
+ '--extra-dir=' + join_paths('gio', '..', 'glib', 'html'),
+ '--extra-dir=' + join_paths('gio', '..', 'gobject', 'html'),
],
install: true
)
diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
index fbe3422d0..f14824bff 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -140,7 +140,6 @@ if get_option('gtk_doc')
],
fixxref_args: [
'--html-dir=' + docpath,
- # TODO: gobject/gio extra dirs
],
install: true)
endif
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index ac2da57d9..014fe5405 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -103,7 +103,7 @@ if get_option('gtk_doc')
],
fixxref_args: [
'--html-dir=' + docpath,
- '--extra-dir=' + join_paths(meson.current_build_dir(), '../glib/html'),
+ '--extra-dir=' + join_paths('gobject', '..', 'glib', 'html'),
],
install: true
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]