From dba7a6aded561a72f9cbd6b29f953278cce18240 Mon Sep 17 00:00:00 2001 From: awvwgk <28669218+awvwgk@users.noreply.github.com> Date: Thu, 3 Oct 2019 17:21:23 +0200 Subject: [PATCH] fixes #6 - added asciidoc as dependency - build manpages if asciidoc is found and add them to install - remove parameters for install, since they are included in the source --- man/{ => man1}/xtb.1.txt | 0 man/{ => man7}/xcontrol.7.txt | 0 meson.build | 28 ++++++++++------------------ 3 files changed, 10 insertions(+), 18 deletions(-) rename man/{ => man1}/xtb.1.txt (100%) rename man/{ => man7}/xcontrol.7.txt (100%) diff --git a/man/xtb.1.txt b/man/man1/xtb.1.txt similarity index 100% rename from man/xtb.1.txt rename to man/man1/xtb.1.txt diff --git a/man/xcontrol.7.txt b/man/man7/xcontrol.7.txt similarity index 100% rename from man/xcontrol.7.txt rename to man/man7/xcontrol.7.txt diff --git a/meson.build b/meson.build index 9a008c334..96991b213 100644 --- a/meson.build +++ b/meson.build @@ -342,27 +342,19 @@ xtb_dep = [declare_dependency(link_with: xtb_lib_shared), dependencies_sha] ## INSTALL ## ========================================== ## install_headers('include/xtb.h') -install_man(['man/man1/xtb.1', 'man/man7/xcontrol.7']) + +asciidoc = find_program('a2x', required: false) +if asciidoc.found() + run_command(asciidoc, 'man/man1/xtb.1.txt', '--format=manpage') + run_command(asciidoc, 'man/man7/xcontrol.7.txt', '--format=manpage') + install_man(['man/man1/xtb.1', 'man/man7/xcontrol.7']) +endif xtb_parameter_files = ['.param_gfn0.xtb', '.param_gfn2.xtb', - '.param_gfn.xtb', - '.param_ipea.xtb'] - -gbsa_parameter_files = ['.param_gbsa_acetone', - '.param_gbsa_acetonitrile', - '.param_gbsa_benzene', - '.param_gbsa_ch2cl2', - '.param_gbsa_chcl3', - '.param_gbsa_cs2', - '.param_gbsa_dmso', - '.param_gbsa_ether', - '.param_gbsa_h2o', - '.param_gbsa_methanol', - '.param_gbsa_thf', - '.param_gbsa_toluene'] - -install_data(xtb_parameter_files, gbsa_parameter_files) + '.param_gfn.xtb'] + +install_data(xtb_parameter_files) ## ========================================== ## ## TESTSUITE