diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-09-24 14:44:26 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-09-24 14:44:26 +0000 |
| commit | a683a13120e132bbbca8cfa58f4886895cca639f (patch) | |
| tree | 8c249e10087e43b9b7364de0b763eaf6b4b734e5 | |
| parent | Merge branch 'make-doc-generation-optional' into master (diff) | |
Revert "meson: add -Dwith-docs=disabled|enabled|auto"
This reverts commit 9d6b2c934222f7e492fba06d02dd2d5991814d1b.
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | doc/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 26 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
4 files changed, 11 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 26741557..03e64784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/doc/meson.build b/doc/meson.build index b26acd65..1f017db4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -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}, diff --git a/meson.build b/meson.build index a882dd0b..fc79f8a8 100644 --- a/meson.build +++ b/meson.build @@ -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') @@ -161,23 +158,20 @@ custom_target( 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 +# ) diff --git a/meson_options.txt b/meson_options.txt deleted file mode 100644 index 1e69f223..00000000 --- a/meson_options.txt +++ /dev/null @@ -1,2 +0,0 @@ -option('with-docs', type: 'feature', value: 'enabled', - description: 'generate and install documentation (man pages). Requires scdoc.') |
