From 780f7c64f9c6b14755ec8140e46436081e1e1468 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 23 Sep 2018 16:01:48 -0400 Subject: [PATCH] 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 )