Revert "meson: add -Dwith-docs=disabled|enabled|auto"

This reverts commit 9d6b2c9342.
This commit is contained in:
Daniel Eklöf 2020-09-24 16:44:26 +02:00
parent e3eb58d483
commit a683a13120
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 11 additions and 25 deletions

View file

@ -16,13 +16,6 @@
## Unreleased
### Added
* `-Dwith-docs=disabled|enabled|auto` meson command line option. When
disabled, no documentation will be installed. This includes man
pages as well as `README.md`, `CHANGELOG.md` and `LICENSE`. Defaults
to `enabled`.
### Changed
### Deprecated
### Removed

View file

@ -1,5 +1,6 @@
sh = find_program('sh', native: true)
scdoc = dependency('scdoc', native: true)
scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
foreach man_src : [{'name': 'foot', 'section' : 1},

View file

@ -60,9 +60,6 @@ wayland_client = dependency('wayland-client')
wayland_cursor = dependency('wayland-cursor')
xkb = dependency('xkbcommon')
fontconfig = dependency('fontconfig')
scdoc = dependency('scdoc', native: true, required: get_option('with-docs'))
build_and_install_docs = scdoc.found()
tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist')
fcft = dependency('fcft', version: ['>=2.3.0', '<3.0.0'], fallback: 'fcft')
@ -160,24 +157,21 @@ custom_target(
install: true,
install_dir: join_paths(get_option('datadir'), 'terminfo'))
install_data(
'LICENSE', 'README.md', 'CHANGELOG.md',
install_dir: join_paths(get_option('datadir'), 'doc', 'foot'))
install_data(
'foot.desktop', 'foot-server.desktop',
install_dir: join_paths(get_option('datadir'), 'applications'))
install_data('foot.ini', install_dir: join_paths(get_option('datadir'), 'foot'))
subdir('completions')
subdir('doc')
subdir('icons')
if build_and_install_docs
install_data(
'LICENSE', 'README.md', 'CHANGELOG.md',
install_dir: join_paths(get_option('datadir'), 'doc', 'foot'))
subdir('doc')
endif
summary(
{
'Documentation': build_and_install_docs,
},
bool_yn: true
)
# summary(
# {
# '<feature>': false,
# },
# bool_yn: true
# )

View file

@ -1,2 +0,0 @@
option('with-docs', type: 'feature', value: 'enabled',
description: 'generate and install documentation (man pages). Requires scdoc.')