summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/html/meson.build13
-rw-r--r--doc/meson.build2
-rw-r--r--doc/singlehtml/meson.build13
3 files changed, 14 insertions, 14 deletions
diff --git a/doc/html/meson.build b/doc/html/meson.build
index df7cb72..59da474 100644
--- a/doc/html/meson.build
+++ b/doc/html/meson.build
@@ -8,13 +8,12 @@ html_dir = docdir / versioned_name / 'html'
custom_target(
'html',
build_by_default: true,
- command: [
- sphinx_build,
- '-M', 'html',
- '@OUTDIR@' / '..',
- '@OUTDIR@' / '..',
+ command: sphinx_build_command + [
+ '-b', 'html',
'-t', 'html',
- ] + sphinx_flags,
+ sphinx_in_dir,
+ '@OUTDIR@',
+ ],
input: [api_lilv_rst, conf_py, sphinx_input],
install: true,
install_dir: html_dir,
@@ -33,7 +32,7 @@ custom_target(
if not meson.is_subproject()
summary(
- 'Paginated HTML',
+ 'HTML',
get_option('prefix') / html_dir,
section: 'Directories',
)
diff --git a/doc/meson.build b/doc/meson.build
index ffdefdd..32a885b 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -51,12 +51,14 @@ if build_docs
subdir('api')
# Build strict Sphinx flags, with termination on warnings if werror=true
+ sphinx_in_dir = meson.current_build_dir()
sphinx_flags = ['-E', '-a', '-q']
if get_option('werror')
sphinx_flags += ['-W']
endif
# Run Sphinx to generate final documentation for each format
+ sphinx_build_command = [sphinx_build] + sphinx_flags
foreach format : ['html', 'singlehtml']
if not get_option(format).disabled()
subdir(format)
diff --git a/doc/singlehtml/meson.build b/doc/singlehtml/meson.build
index 5d3912d..ed4bb71 100644
--- a/doc/singlehtml/meson.build
+++ b/doc/singlehtml/meson.build
@@ -8,13 +8,12 @@ singlehtml_dir = docdir / versioned_name / 'singlehtml'
custom_target(
'singlehtml',
build_by_default: true,
- command: [
- sphinx_build,
- '-M', 'singlehtml',
- '@OUTDIR@' / '..',
- '@OUTDIR@' / '..',
+ command: sphinx_build_command + [
+ '-b', 'singlehtml',
'-t', 'singlehtml',
- ] + sphinx_flags,
+ sphinx_in_dir,
+ '@OUTDIR@',
+ ],
input: [api_lilv_rst, conf_py, sphinx_input],
install: true,
install_dir: singlehtml_dir,
@@ -27,7 +26,7 @@ custom_target(
if not meson.is_subproject()
summary(
- 'Unified HTML',
+ 'Single HTML',
get_option('prefix') / singlehtml_dir,
section: 'Directories',
)