diff --git a/meson.build b/meson.build index 7bb317e468bd68f69c3b09cc03c900638d411aea..2566fe66470011947435b89a6c847c3959afeb30 100644 --- a/meson.build +++ b/meson.build @@ -183,10 +183,6 @@ endif subdir('pressure-vessel') -if get_option('man') - subdir('man') -endif - subdir('tests') # vim:set sw=2 sts=2 et: diff --git a/CONTRIBUTING.md b/pressure-vessel/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to pressure-vessel/CONTRIBUTING.md diff --git a/README.md b/pressure-vessel/README.md similarity index 100% rename from README.md rename to pressure-vessel/README.md diff --git a/THIRD-PARTY.md b/pressure-vessel/THIRD-PARTY.md similarity index 100% rename from THIRD-PARTY.md rename to pressure-vessel/THIRD-PARTY.md diff --git a/man/adverb.1.md b/pressure-vessel/adverb.1.md similarity index 100% rename from man/adverb.1.md rename to pressure-vessel/adverb.1.md diff --git a/pressure-vessel/build-relocatable-install.py b/pressure-vessel/build-relocatable-install.py index 1444627e8da86eb4fb83844e005306a31b32dc1f..ec6cde2771e7ce82f1986087d3f2847d98da7b65 100755 --- a/pressure-vessel/build-relocatable-install.py +++ b/pressure-vessel/build-relocatable-install.py @@ -263,7 +263,7 @@ def main(): ) install( - os.path.join(args.srcdir, 'THIRD-PARTY.md'), + os.path.join(args.srcdir, 'pressure-vessel', 'THIRD-PARTY.md'), os.path.join(installation, 'metadata', 'README.txt'), 0o644, ) diff --git a/man/launch.1.md b/pressure-vessel/launch.1.md similarity index 100% rename from man/launch.1.md rename to pressure-vessel/launch.1.md diff --git a/man/launcher.1.md b/pressure-vessel/launcher.1.md similarity index 100% rename from man/launcher.1.md rename to pressure-vessel/launcher.1.md diff --git a/man/locale-gen.1.md b/pressure-vessel/locale-gen.1.md similarity index 100% rename from man/locale-gen.1.md rename to pressure-vessel/locale-gen.1.md diff --git a/man/meson.build b/pressure-vessel/man/meson.build similarity index 58% rename from man/meson.build rename to pressure-vessel/man/meson.build index 22fa8b32da0d9430e24bc4828f63bc59570dbf64..3e2beb6e71a1a44afbc200fdca80dd70c217f9ca 100644 --- a/man/meson.build +++ b/pressure-vessel/man/meson.build @@ -21,48 +21,4 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -pandoc = find_program('pandoc', required : true) - -if run_command(pandoc, [ - '-f', 'markdown-smart', - '-t', 'man', - '/dev/null', -]).returncode() == 0 - pandoc_markdown_nosmart = 'markdown-smart' -else - pandoc_markdown_nosmart = 'markdown' -endif - -foreach tool : [ - 'adverb', - 'launch', - 'launcher', - 'locale-gen', - 'test-ui', - 'try-setlocale', - 'unruntime', - 'wrap', -] - custom_target( - tool + '.1', - build_by_default : true, - command : [ - pandoc, - '-s', - '-o', '@OUTPUT@', - '-f', pandoc_markdown_nosmart, - '-t', 'man', - '@INPUT@', - ], - input : tool + '.1.md', - output : 'pressure-vessel-' + tool + '.1', - install : true, - install_dir : join_paths( - get_option('prefix'), - get_option('mandir'), - 'man1', - ), - ) -endforeach - # vim:set sw=2 sts=2 et: diff --git a/pressure-vessel/meson.build b/pressure-vessel/meson.build index 99b9241d19feafc3a814c2a262203b1550b4e3f7..fe1dcb70a84e1a21bed8bb1a21866a5076b85d02 100644 --- a/pressure-vessel/meson.build +++ b/pressure-vessel/meson.build @@ -242,4 +242,50 @@ if get_option('srcdir') != '' ) endif +if get_option('man') + pandoc = find_program('pandoc', required : true) + + if run_command(pandoc, [ + '-f', 'markdown-smart', + '-t', 'man', + '/dev/null', + ]).returncode() == 0 + pandoc_markdown_nosmart = 'markdown-smart' + else + pandoc_markdown_nosmart = 'markdown' + endif + + foreach tool : [ + 'adverb', + 'launch', + 'launcher', + 'locale-gen', + 'test-ui', + 'try-setlocale', + 'unruntime', + 'wrap', + ] + custom_target( + tool + '.1', + build_by_default : true, + command : [ + pandoc, + '-s', + '-o', '@OUTPUT@', + '-f', pandoc_markdown_nosmart, + '-t', 'man', + '@INPUT@', + ], + input : tool + '.1.md', + output : 'pressure-vessel-' + tool + '.1', + install : true, + install_dir : join_paths( + get_option('prefix'), + get_option('mandir'), + 'man1', + ), + ) + endforeach +endif + # vim:set sw=2 sts=2 et: diff --git a/man/test-ui.1.md b/pressure-vessel/test-ui.1.md similarity index 100% rename from man/test-ui.1.md rename to pressure-vessel/test-ui.1.md diff --git a/man/try-setlocale.1.md b/pressure-vessel/try-setlocale.1.md similarity index 100% rename from man/try-setlocale.1.md rename to pressure-vessel/try-setlocale.1.md diff --git a/man/unruntime.1.md b/pressure-vessel/unruntime.1.md similarity index 100% rename from man/unruntime.1.md rename to pressure-vessel/unruntime.1.md diff --git a/man/wrap.1.md b/pressure-vessel/wrap.1.md similarity index 100% rename from man/wrap.1.md rename to pressure-vessel/wrap.1.md