luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1537-fixxref' into 'master'

Browse Source 
Meson: doc: fix cross references

Closes #1537

See merge request GNOME/glib!344
This commit is contained in:
Xavier Claessens 2018-09-24 14:49:02 +00:00
commit 8bfb1d0ea3
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/gio/meson.build
View File

@ -221,8 +221,8 @@ if get_option('gtk_doc')
], ],
fixxref_args: [ fixxref_args: [
'--html-dir=' + docpath, '--html-dir=' + docpath,
'--extra-dir=' + join_paths(meson.current_build_dir(), '../glib/html'), '--extra-dir=' + join_paths('gio', '..', 'glib', 'html'),
'--extra-dir=' + join_paths(meson.current_build_dir(), '../gobject/html'), '--extra-dir=' + join_paths('gio', '..', 'gobject', 'html'),
], ],
install: true install: true
) )

1
docs/reference/glib/meson.build
View File

@ -140,7 +140,6 @@ if get_option('gtk_doc')
], ],
fixxref_args: [ fixxref_args: [
'--html-dir=' + docpath, '--html-dir=' + docpath,
# TODO: gobject/gio extra dirs
], ],
install: true) install: true)
endif endif

2
docs/reference/gobject/meson.build
View File

@ -103,7 +103,7 @@ if get_option('gtk_doc')
], ],
fixxref_args: [ fixxref_args: [
'--html-dir=' + docpath, '--html-dir=' + docpath,
'--extra-dir=' + join_paths(meson.current_build_dir(), '../glib/html'), '--extra-dir=' + join_paths('gobject', '..', 'glib', 'html'),
], ],
install: true install: true
) )