Permit make dist* targets without py*-docutils
PATCH 2/2 Permit make dist* targets without py*-docutils
--- doc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
doc/Makefile.am +3 -2
@@ -59,8 +59,9 @@ else endif if HAVE_PYDOCUTILS -dist_noinst_DATA += openvpn.8 -dist_html_DATA = openvpn.8.html +nodist_noinst_DATA = openvpn.8 +nodist_html_DATA = openvpn.8.html +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) # Failsafe - do not delete these files unless we can recreate them CLEANFILES = \
--
2.25.4
Quoted 11 lines · Matthias Andree
Signed-off-by Matthias Andree <[email protected]...>--- doc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)doc/Makefile.am +0
-0@@ -59,8 +59,9 @@ else endif
doc/Makefile.am else · line 67
Quoted 10 lines
doc/Makefile.am +3
-2if HAVE_PYDOCUTILS -dist_noinst_DATA += openvpn.8 -dist_html_DATA = openvpn.8.html +nodist_noinst_DATA = openvpn.8 +nodist_html_DATA = openvpn.8.html +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) # Failsafe - do not delete these files unless we can recreate them CLEANFILES = \
Thanks! This fixes the 'make distdir', which should also fix the 'make check' issues Gert found [1].
[1] Message-Id: [email protected]...
<https://www.mail-archive.com/[email protected]/msg20436.html>
Signature · 4 lines
kind regards, David Sommerseth OpenVPN Inc
Quoted 27 lines · David Sommerseth
Quoted 11 lines · Matthias Andree
Signed-off-by Matthias Andree <[email protected]...>--- doc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)doc/Makefile.am +0
-0@@ -59,8 +59,9 @@ else endifdoc/Makefile.am else · line 67
Quoted 10 lines
doc/Makefile.am +3
-2if HAVE_PYDOCUTILS -dist_noinst_DATA += openvpn.8 -dist_html_DATA = openvpn.8.html +nodist_noinst_DATA = openvpn.8 +nodist_html_DATA = openvpn.8.html +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) # Failsafe - do not delete these files unless we can recreate them CLEANFILES = \Thanks! This fixes the 'make distdir', which should also fix the 'make check' issues Gert found [1].
Quoted 6 lines
[1] Message-Id: [email protected]...
<https://www.mail-archive.com/[email protected]/msg20436.html>
So I'm just retracting the Acked-By ... as this isn't needed.
We were just confused by some failing tests on one of the buildslaves and realised to late it failed with 'make dist' - not 'make check'. And then this change makes things worse by not distributing generated man/html files if py-docutils is not present.
All the 'make dist*' targets _should_ fail if py-docutils is not present and the doc/openvpn.8 and doc/openvpn.8.html files are missing. Running 'make check' should not fail in any if these cases.
Signature · 4 lines
kind regards, David Sommerseth OpenVPN Inc
Matthias Andree
NAKAm 17.07.20 um 17:05 schrieb Matthias Andree:
Quoted 10 lines
Signed-off-by Matthias Andree <[email protected]...>--- doc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)doc/Makefile.am +0
-0
doc/Makefile.am else · line 64
Quoted 8 lines
doc/Makefile.am +3
-2@@ -59,8 +59,9 @@ else endif if HAVE_PYDOCUTILS -dist_noinst_DATA += openvpn.8 -dist_html_DATA = openvpn.8.html +nodist_noinst_DATA = openvpn.8 +nodist_html_DATA = openvpn.8.html +EXTRA_DIST = openvpn.8 $(nodist_html_DATA)
NAK - reject - superseded by newer patch.