[devhelp/gnome-3-36] build: docs: improvements, add more fixxref's

[Sébastien Wilmet <swilmet src gnome org>]

commit 5e731ffa5975b881a4a523bb86a2f5b5df719445
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Apr 4 00:47:46 2020 +0200

    build: docs: improvements, add more fixxref's

 docs/reference/meson.build | 15 +++++++++++----
 meson.build                |  3 +--
 2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 6034dcb7..602f07cb 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -7,10 +7,13 @@ configure_file(
 )
 
 gtkdoc_module_name = 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION)
-html_dir = join_paths(get_option('prefix'), GNOME.gtkdoc_html_dir(gtkdoc_module_name))
+html_dir = get_option('prefix') / GNOME.gtkdoc_html_dir(gtkdoc_module_name)
 
-webkitgtk_dep = dependency(WEBKITGTK_DEP_STR)
-webkitgtk_prefix = webkitgtk_dep.get_pkgconfig_variable('prefix')
+glib_docpath = dependency('glib-2.0').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/glib'
+gobject_docpath = dependency('gobject-2.0').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/gobject'
+gio_docpath = dependency('gio-2.0').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/gio'
+gtk_docpath = dependency('gtk+-3.0').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/gtk3'
+webkitgtk_docpath = dependency('webkit2gtk-4.0').get_pkgconfig_variable('prefix') / 
'share/gtk-doc/html/webkit2gtk-4.0'
 
 GNOME.gtkdoc(
   gtkdoc_module_name,
@@ -21,7 +24,11 @@ GNOME.gtkdoc(
   gobject_typesfile : 'devhelp-@0@.types'.format(LIBDEVHELP_API_VERSION),
   fixxref_args : [
     '--html-dir=@0@'.format(html_dir),
-    '--extra-dir=@0@/share/gtk-doc/html/@1@'.format(webkitgtk_prefix, WEBKITGTK_DEP_STR)
+    '--extra-dir=@0@'.format(glib_docpath),
+    '--extra-dir=@0@'.format(gobject_docpath),
+    '--extra-dir=@0@'.format(gio_docpath),
+    '--extra-dir=@0@'.format(gtk_docpath),
+    '--extra-dir=@0@'.format(webkitgtk_docpath)
   ],
   content_files : [
     'api-breaks.xml'
diff --git a/meson.build b/meson.build
index daa6f553..e1316737 100644
--- a/meson.build
+++ b/meson.build
@@ -32,11 +32,10 @@ lt_revision = 2
 lt_age = 0
 LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
 
-WEBKITGTK_DEP_STR = 'webkit2gtk-4.0'
 libdevhelp_deps_array = [
   ['gio-2.0', '>= 2.60'],
   ['gtk+-3.0', '>= 3.22'],
-  [WEBKITGTK_DEP_STR, '>= 2.24']
+  ['webkit2gtk-4.0', '>= 2.24']
 ]
 
 LIBDEVHELP_DEPS_STR = []