Skip to contentSkip to conversation

build: Fix missing install of man page in certain environments

PATCH In review David Sommerseth 2 participants 2 messages Oct 29, 2020 – Nov 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 build: Fix missing install of man page in certain environments

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.

---

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(-)
doc/Makefile.am +2 -1
index 340dd553..df2f54a3 100644
@@ -67,10 +67,11 @@ dist_html_DATA = openvpn.8.html
 CLEANFILES = \
 	 openvpn.8 openvpn.8.html
 
+endif
+
 if WIN32
 else
 dist_man_MANS = openvpn.8
 endif
-endif
 
 dist-hook : openvpn.8 openvpn.8.html
Signature · 1 line
2.26.0
Acked-by on v1 1/1
#1 lore raw

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 <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg21236.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering