From d2dbfba2082942ef39611c97167bbb71c735a15d Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 21 Dec 2023 17:00:06 +0000 Subject: [PATCH] docs: Install the gi-docgen docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are now installed to (e.g.) `${prefix}/share/doc/glib-2.0/{glib,gmodule,gobject,gio}/index.html`. We might want to drop one level of nesting out of that, but for the moment I thought I’d keep it in so we can disambiguate by installed major version. Signed-off-by: Philip Withnall Helps: #3037 --- docs/reference/gio/meson.build | 3 +++ docs/reference/glib/meson.build | 5 ++++- docs/reference/gmodule/meson.build | 3 +++ docs/reference/gobject/meson.build | 3 +++ docs/reference/meson.build | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build index 060cf0708..b0d68b7d2 100644 --- a/docs/reference/gio/meson.build +++ b/docs/reference/gio/meson.build @@ -54,4 +54,7 @@ custom_target('gio-docs', ], build_by_default: true, depend_files: expand_content_files, + install: true, + install_dir: docs_dir, + install_tag: 'doc', ) diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build index f013a5469..b976851b8 100644 --- a/docs/reference/glib/meson.build +++ b/docs/reference/glib/meson.build @@ -18,7 +18,7 @@ if get_option('documentation') rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) if rst2html5.found() - spec_path = glib_datadir / 'doc' / 'glib-2.0' + spec_path = docs_dir figures = files( 'gvariant-byte-boundaries.svg', @@ -109,4 +109,7 @@ custom_target('glib-docs', ], build_by_default: true, depend_files: expand_content_files, + install: true, + install_dir: docs_dir, + install_tag: 'doc', ) diff --git a/docs/reference/gmodule/meson.build b/docs/reference/gmodule/meson.build index ac324d672..eb75a0506 100644 --- a/docs/reference/gmodule/meson.build +++ b/docs/reference/gmodule/meson.build @@ -20,4 +20,7 @@ custom_target('gmodule-docs', ], build_by_default: true, depend_files: expand_content_files, + install: true, + install_dir: docs_dir, + install_tag: 'doc', ) diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build index 4ceb2db23..738d121e7 100644 --- a/docs/reference/gobject/meson.build +++ b/docs/reference/gobject/meson.build @@ -41,4 +41,7 @@ custom_target('gobject-docs', ], build_by_default: true, depend_files: expand_content_files, + install: true, + install_dir: docs_dir, + install_tag: 'doc', ) diff --git a/docs/reference/meson.build b/docs/reference/meson.build index b3fe14d74..b583278f8 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -14,6 +14,8 @@ if get_option('documentation') and enable_gir '--fatal-warnings', ] + docs_dir = glib_datadir / 'doc' / 'glib-2.0' + subdir('glib') subdir('gmodule') subdir('gobject')