summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--doc/meson.build6
-rw-r--r--meson.build9
-rw-r--r--meson_options.txt3
4 files changed, 8 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index bf5e343..2e2078c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
sord (0.16.17) unstable; urgency=medium
+ * Add option to install tool man pages
* Enable clang nullability checks
* Fix library current_version on MacOS
- -- David Robillard <d@drobilla.net> Thu, 14 Mar 2024 17:14:29 +0000
+ -- David Robillard <d@drobilla.net> Thu, 14 Mar 2024 18:12:02 +0000
sord (0.16.16) stable; urgency=medium
diff --git a/doc/meson.build b/doc/meson.build
index f194e4c..33f120e 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -2,11 +2,9 @@
# SPDX-License-Identifier: 0BSD OR ISC
docdir = get_option('datadir') / 'doc'
-
doxygen = find_program('doxygen', required: get_option('docs'))
build_docs = doxygen.found()
-
if build_docs
config = configuration_data()
config.set('SORD_VERSION', meson.project_version())
@@ -30,10 +28,6 @@ if build_docs
)
endif
-if not get_option('docs').disabled()
- install_man(files('sord_validate.1', 'sordi.1'))
-endif
-
if not meson.is_subproject()
summary('API Documentation', build_docs, bool_yn: true, section: 'Components')
endif
diff --git a/meson.build b/meson.build
index 91b1eb9..e4579d2 100644
--- a/meson.build
+++ b/meson.build
@@ -150,9 +150,8 @@ if not get_option('tools').disabled()
meson.override_find_program('sord_validate', sord_validate)
endif
- if not get_option('docs').disabled()
- install_man(files('doc/sordi.1'))
- install_man(files('doc/sord_validate.1'))
+ if not get_option('man').disabled()
+ install_man(files('doc/sord_validate.1', 'doc/sordi.1'))
endif
endif
@@ -195,6 +194,4 @@ if not get_option('tests').disabled()
subdir('test')
endif
-if not get_option('docs').disabled()
- subdir('doc')
-endif
+subdir('doc')
diff --git a/meson_options.txt b/meson_options.txt
index 257c045..41c5eb9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,6 +4,9 @@
option('docs', type: 'feature', value: 'auto', yield: true,
description: 'Build documentation')
+option('man', type: 'feature', value: 'enabled', yield: true,
+ description: 'Install man pages')
+
option('tests', type: 'feature', value: 'auto', yield: true,
description: 'Build tests')