diff options
| author | David Robillard <d@drobilla.net> | 2023-09-23 16:56:45 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2023-09-23 16:56:45 -0400 |
| commit | f4b2ca45a95399736cba03458cb28958ec4b8379 (patch) | |
| tree | af6e0026c781b1d67a267a827fe09806ab25d515 | |
| parent | ac23e74f8bce3d782fb202e0787bbff737e07733 (diff) | |
| download | zix-f4b2ca45a95399736cba03458cb28958ec4b8379.tar.gz zix-f4b2ca45a95399736cba03458cb28958ec4b8379.tar.bz2 zix-f4b2ca45a95399736cba03458cb28958ec4b8379.zip | |
Clean up sphinx build commands
| -rw-r--r-- | doc/html/meson.build | 13 | ||||
| -rw-r--r-- | doc/meson.build | 2 | ||||
| -rw-r--r-- | doc/singlehtml/meson.build | 13 |
3 files changed, 14 insertions, 14 deletions
diff --git a/doc/html/meson.build b/doc/html/meson.build index fb84a04..9931028 100644 --- a/doc/html/meson.build +++ b/doc/html/meson.build @@ -6,13 +6,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_zix_rst, conf_py, sphinx_input], install: true, install_dir: html_dir, @@ -31,7 +30,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 98cb4af..6d60bbb 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -81,12 +81,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 63a1bc2..d3e3b0d 100644 --- a/doc/singlehtml/meson.build +++ b/doc/singlehtml/meson.build @@ -6,13 +6,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_zix_rst, conf_py, sphinx_input], install: true, install_dir: singlehtml_dir, @@ -25,7 +24,7 @@ custom_target( if not meson.is_subproject() summary( - 'Unified HTML', + 'Single HTML', get_option('prefix') / singlehtml_dir, section: 'Directories', ) |