docs: dist curl*.1 and install without perl

Drop docs/mk-ca-bundle.1 from the tarball. It can be generated at will.

Closes #12959
Fixes #12921
Reported-by: Michael Forney

diff --git a/Makefile.am b/Makefile.am
index 6457d03dc4393126e45de27a19e3ae7fd3c58993..bc995f1ed56067bf126eaa035d9488968289b1c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,6 +249,7 @@ install-data-hook:
 else
 install-data-hook:
        (cd include && $(MAKE) install)
+       (cd docs && $(MAKE) install)
 endif
 
 # We extend the standard uninstall with a custom hook:

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 96c876019aa21c205caf9023cb9d539f403f0cf7..7dff43361503073f62aa5642f03d933ee80be302 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -30,12 +30,7 @@ MK_CA_DOCS = mk-ca-bundle.1
 CURLCONF_DOCS = curl-config.1
 endif
 
-
-# EXTRA_DIST breaks with $(abs_builddir) so build it using this variable
-# but distribute it (using the relative file name) in the next variable
-man_MANS = $(abs_builddir)/curl.1
-noinst_man_MANS = $(MK_CA_DOCS)
-dist_man_MANS = $(CURLCONF_DOCS) $(MK_CA_DOCS)
+man_MANS = $(abs_builddir)/curl.1 curl-config.1
 CURLPAGES = curl-config.md mk-ca-bundle.md
 
 # Build targets in this file (.) before cmdline-opts to ensure that
@@ -43,11 +38,13 @@ CURLPAGES = curl-config.md mk-ca-bundle.md
 SUBDIRS = . cmdline-opts libcurl
 DIST_SUBDIRS = $(SUBDIRS) examples
 
-CLEANFILES = $(man_MANS) curl.1 $(CURLCONF_DOCS) $(MK_CA_DOCS)
-nodist_MANS = $(CLEANFILES)
+if BUILD_DOCS
+CLEANFILES = curl.1 mk-ca-bundle.1 curl-config.1
+endif
 
 EXTRA_DIST =                                    \
  $(CURLPAGES)                                   \
+ $(CURLCONF_DOCS)                               \
  ALTSVC.md                                      \
  BINDINGS.md                                    \
  BUFREF.md                                      \
@@ -112,6 +109,8 @@ CD2_ = $(CD2_0)
 
 SUFFIXES = .1 .md
 
+all: $(MK_CA_DOCS)
+
 # $(abs_builddir) is to disable VPATH when searching for this file, which
 # would otherwise find the copy in $(srcdir) which breaks the $(HUGE)
 # rule in src/Makefile.am in out-of-tree builds that references the file in the
@@ -131,6 +130,8 @@ $(abs_builddir)/curl.1:
 
 curl-config.1: curl-config.md
 
+mk-ca-bundle.1: mk-ca-bundle.md
+
 distclean:
        rm -f $(CLEANFILES)
 

diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am
index 1a70b9673340704a7fab948e831bac5390d0ea94..d6e43149262266d02be2cb51536ceba04c5cf483 100644 (file)
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -36,7 +36,6 @@ m4macrodir = $(datadir)/aclocal
 dist_m4macro_DATA = libcurl.m4
 
 CLEANFILES = $(man_MANS) libcurl-symbols.md
-nodist_MANS = $(man_MANS)
 
 EXTRA_DIST = $(CURLPAGES) ABI.md symbols-in-versions symbols.pl  \
   mksymbolsmanpage.pl CMakeLists.txt

diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am
index 111202ddd3961da650a92a9ee88ea6bd1e7a177b..be877c52ef907bcc53a8c890e882d1167c6c8b17 100644 (file)
--- a/docs/libcurl/opts/Makefile.am
+++ b/docs/libcurl/opts/Makefile.am
@@ -30,7 +30,6 @@ include Makefile.inc
 CURLPAGES = $(man_MANS:.3=.md)
 endif
 CLEANFILES = $(man_MANS)
-nodist_MANS = $(man_MANS)
 
 EXTRA_DIST = $(CURLPAGES) CMakeLists.txt