Skip to contentSkip to conversation

doc/man: Do not install man *.rst files

PATCH In review David Sommerseth 2 participants 2 messages Jul 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 doc/man: Do not install man *.rst files

When the man page got split up into several .rst files, these files got listed into dist_doc_DATA=. This variable will both distribute (package in the source tarball) and install these files into /usr/share/doc. This was not intended, and it duplicates the content and makes the doc dir quite messy.

By moving these files to dist_noinst_DATA= instead, these files are still distributed but not installed via 'make install'.

---
 doc/Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
doc/Makefile.am +5 -4
index add92198..340dd553 100644
@@ -15,7 +15,11 @@ MAINTAINERCLEANFILES = \
 SUBDIRS = doxygen
 
 dist_doc_DATA = \
-	management-notes.txt openvpn.8.rst \
+	management-notes.txt
+
+dist_noinst_DATA = \
+	README.plugins interactive-service-notes.rst \
+	openvpn.8.rst \
 	man-sections/advanced-options.rst \
 	man-sections/client-options.rst \
 	man-sections/connection-profiles.rst \
@@ -41,9 +45,6 @@ dist_doc_DATA = \
 	man-sections/vpn-network-options.rst \
 	man-sections/windows-options.rst
 
-dist_noinst_DATA = \
-	README.plugins interactive-service-notes.rst
-
 openvpn.8 :
 if HAVE_PYDOCUTILS
 	$(RST2MAN) $(srcdir)/[email protected] > $@
Signature · 1 line
2.26.0
Acked-by on v1 1/1
#1 lore raw

[Openvpn-devel] [PATCH applied] Re: doc/man: Do not install man CONTRIBUTING.rst Changes.rst files

Your patch has been applied to the master branch.

commit 4cabd28a77116ab3926f81258af9bdb342e0336a

Author: David Sommerseth
Date:   Sun Jul 19 13:48:53 2020 +0200
     doc/man: Do not install man CONTRIBUTING.rst Changes.rst files

     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]/msg20476.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering