diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-05 16:22:25 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-10 00:24:30 +0300 |
| commit | 3fb2397f0d9509ae4ca9c801d2aaf396c726d13b (patch) | |
| tree | 6aaa3e4ee32d900b1456032b7d99e25726e559cf /doc/manpages | |
| parent | 8762b0ebe1d2bf64a0b97486fe12da084d9fa041 (diff) | |
| download | gnutls-3fb2397f0d9509ae4ca9c801d2aaf396c726d13b.tar.gz | |
manpages: fix manpages distribution
It seems that dist_man_MANS does not work properly with Automake
conditionals. Automake will not distribute files which are conditionally
disabled at this make run. As released tarballs include all manpages
already, let's include them unconditionally.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'doc/manpages')
| -rw-r--r-- | doc/manpages/Makefile.am | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index 246b50005f..d0544a14d4 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -19,23 +19,30 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +man_MANS = EXTRA_DIST = stamp_mans - -dist_man_MANS = +MAINTAINERCLEANFILES = stamp_mans -include $(top_srcdir)/doc/doc.mk -if ENABLE_TOOLS -dist_man_MANS += gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1 \ +TOOLS_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1 \ certtool.1 psktool.1 p11tool.1 ocsptool.1 tpmtool.1 +SRP_MANS = srptool.1 +DANE_MANS = danetool.1 + +if ENABLE_TOOLS +man_MANS += $(TOOLS_MANS) if ENABLE_SRP -dist_man_MANS += srptool.1 +man_MANS += $(SRP_MANS) endif if ENABLE_DANE -dist_man_MANS += danetool.1 +man_MANS += $(DANE_MANS) endif endif +EXTRA_DIST += $(TOOLS_MANS) $(SRP_MANS) $(DANE_MANS) +MAINTAINERCLEANFILES += $(TOOLS_MANS) $(SRP_MANS) $(DANE_MANS) + # Note that our .def files depend on autogen # supporting the @subheading texi keyword. This # is not currently the case so we do remove it @@ -1205,9 +1212,12 @@ APIMANS += gnutls_x509_trust_list_verify_crt2.3 APIMANS += gnutls_x509_trust_list_verify_named_crt.3 if ENABLE_DOC -dist_man_MANS += $(APIMANS) +man_MANS += $(APIMANS) endif +EXTRA_DIST += $(APIMANS) +MAINTAINERCLEANFILES += $(APIMANS) + $(APIMANS): stamp_mans compare-makefile: |