Skip to content

Commit

Permalink
Add option to install tool man pages
Browse files Browse the repository at this point in the history
Fix some strange redundant installation bug in the process.
  • Loading branch information
drobilla committed Mar 14, 2024
1 parent 2c5df8b commit 045b038
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 0 additions & 6 deletions doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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
9 changes: 3 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -195,6 +194,4 @@ if not get_option('tests').disabled()
subdir('test')
endif

if not get_option('docs').disabled()
subdir('doc')
endif
subdir('doc')
3 changes: 3 additions & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down

0 comments on commit 045b038

Please sign in to comment.