[Openvpn-devel] build: Fix missing install of man page in certain environments

Message ID 20201029213259.1636-1-davids@openvpn.net
State Accepted
Headers show
Series [Openvpn-devel] build: Fix missing install of man page in certain environments | expand

Commit Message

David Sommerseth Oct. 29, 2020, 10:32 a.m. UTC
It turns out the logic for dist_man_MANS was incorrectly put inside the
HAVE_PYDOCUTILS block.  This results in the man page being installed
only if python-docutils is installed and available.

The solution is simple, move the dist_man_MANS part outside the
python-docutils block.  The openvpn.8 file is prebuilt in source
tarballs and will thus be available.

Reported-By: Philip Brown <philip@pbdigital.org>
Tested-By: Philip Brown <philip@pbdigital.org>
Signed-off-by: David Sommerseth <davids@openvpn.net>

Note: This may have a negative impact on hosts running 'make install'
(which also happens via 'make distcheck') when using the git tree or
otherwise not having a pre-built doc/openvpn.8 file available.
 doc/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Gert Doering Nov. 24, 2020, 7:31 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

I have not tested it further, but the explanation + test report make
this "good enough"

Your patch has been applied to the master and release/2.5 branch.

commit fc25ca3a7cf720fbb53889fdba6ac0154c7c9c1a (master)
commit bbac1542cfb4a9d3033999b26813f0dd0618c3f0 (release/2.5)
Author: David Sommerseth
Date:   Thu Oct 29 22:32:59 2020 +0100

     build: Fix missing install of man page in certain environments

     Signed-off-by: David Sommerseth <davids@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20201029213259.1636-1-davids@openvpn.net>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21236.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/doc/Makefile.am b/doc/Makefile.am
index 340dd553..df2f54a3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -67,10 +67,11 @@  dist_html_DATA = openvpn.8.html
 	 openvpn.8 openvpn.8.html
 if WIN32
 dist_man_MANS = openvpn.8
 dist-hook : openvpn.8 openvpn.8.html