mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 09:16:15 +02:00
548ec9f186
The `gi-docgen` tool is not designed to be used like that. In
particular, when nesting documentation directories, the generated
`*.devhelp2` files (needed by Devhelp to show the documentation) are
nested one directory level too deep for Devhelp to find them, and hence
are useless, and the documentation doesn’t show up in this common
documentation viewer.
So, change the installed documentation directory hierarchy:
* `${PREFIX}/share/doc/glib-2.0/gio` → `${PREFIX}/share/doc/gio-2.0`
* `${PREFIX}/share/doc/glib-2.0/glib-unix` →
`${PREFIX}/share/doc/glib-unix-2.0`
* `${PREFIX}/share/doc/glib-2.0/gobject` →
`${PREFIX}/share/doc/gobject-2.0`
* etc.
* `${PREFIX}/share/doc/glib-2.0/glib` → `${PREFIX}/share/doc/glib-2.0`
This is going to seem like pointless churn (the contents of the
documentation have not changed), and packagers may mourn the split of
content in `/usr/share/doc` from `/usr/share/doc/${package_name}` to
`/usr/share/doc/${pkg_config_id}` instead, but that seems to be the best
approach to fix this issue in GLib. gi-docgen’s behaviour does feel
fairly consistent and correct with the rest of how it works (single
output directory).
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Fixes: #3287
27 lines
739 B
Meson
27 lines
739 B
Meson
if get_option('documentation') and enable_gir
|
|
gidocgen_dep = dependency('gi-docgen', version: '>= 2023.1',
|
|
fallback: ['gi-docgen', 'dummy_dep'],
|
|
native: true,
|
|
required: true)
|
|
|
|
toml_conf = configuration_data()
|
|
toml_conf.set('VERSION', meson.project_version())
|
|
|
|
gidocgen = find_program('gi-docgen', native: true, required: true)
|
|
|
|
gidocgen_common_args = [
|
|
'--quiet',
|
|
'--no-namespace-dir',
|
|
'--fatal-warnings',
|
|
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../girepository/introspection'),
|
|
]
|
|
endif
|
|
|
|
docs_dir = glib_datadir / 'doc'
|
|
|
|
subdir('glib')
|
|
subdir('gmodule')
|
|
subdir('gobject')
|
|
subdir('gio')
|
|
subdir('girepository')
|