[Openvpn-devel] doc/man: Do not install man *.rst files

Message ID 20200719114853.24168-1-davids@openvpn.net
State Accepted
Headers show
Series
  • [Openvpn-devel] doc/man: Do not install man *.rst files
Related show

Commit Message

David Sommerseth July 19, 2020, 11:48 a.m.
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'.

Signed-off-by: David Sommerseth <davids@openvpn.net>
---
 doc/Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Gert Doering July 19, 2020, 11:55 a.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

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 <davids@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20200719114853.24168-1-davids@openvpn.net>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20476.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/doc/Makefile.am b/doc/Makefile.am
index add92198..340dd553 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -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)/$@.rst > $@