luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: dist curl*.1 and install without perl

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

Closes #12959
Fixes #12921
Reported-by: Michael Forney
This commit is contained in:
Daniel Stenberg 2024-02-19 09:32:07 +01:00
parent bdff974f46
commit ab027d9cbc
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -249,6 +249,7 @@ install-data-hook:
else else
install-data-hook: install-data-hook:
(cd include && $(MAKE) install) (cd include && $(MAKE) install)
(cd docs && $(MAKE) install)
endif endif
# We extend the standard uninstall with a custom hook: # We extend the standard uninstall with a custom hook:

17
docs/Makefile.am
View File

@ -30,12 +30,7 @@ MK_CA_DOCS = mk-ca-bundle.1
CURLCONF_DOCS = curl-config.1 CURLCONF_DOCS = curl-config.1
endif endif
man_MANS = $(abs_builddir)/curl.1 curl-config.1
# 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)
CURLPAGES = curl-config.md mk-ca-bundle.md CURLPAGES = curl-config.md mk-ca-bundle.md
# Build targets in this file (.) before cmdline-opts to ensure that # 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 SUBDIRS = . cmdline-opts libcurl
DIST_SUBDIRS = $(SUBDIRS) examples DIST_SUBDIRS = $(SUBDIRS) examples
CLEANFILES = $(man_MANS) curl.1 $(CURLCONF_DOCS) $(MK_CA_DOCS) if BUILD_DOCS
nodist_MANS = $(CLEANFILES) CLEANFILES = curl.1 mk-ca-bundle.1 curl-config.1
endif
EXTRA_DIST = \ EXTRA_DIST = \
$(CURLPAGES) \ $(CURLPAGES) \
$(CURLCONF_DOCS) \
ALTSVC.md \ ALTSVC.md \
BINDINGS.md \ BINDINGS.md \
BUFREF.md \ BUFREF.md \
@ -112,6 +109,8 @@ CD2_ = $(CD2_0)
SUFFIXES = .1 .md SUFFIXES = .1 .md
all: $(MK_CA_DOCS)
# $(abs_builddir) is to disable VPATH when searching for this file, which # $(abs_builddir) is to disable VPATH when searching for this file, which
# would otherwise find the copy in $(srcdir) which breaks the $(HUGE) # 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 # 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 curl-config.1: curl-config.md
mk-ca-bundle.1: mk-ca-bundle.md
distclean: distclean:
rm -f $(CLEANFILES) rm -f $(CLEANFILES)

1
docs/libcurl/Makefile.am
View File

@ -36,7 +36,6 @@ m4macrodir = $(datadir)/aclocal
dist_m4macro_DATA = libcurl.m4 dist_m4macro_DATA = libcurl.m4
CLEANFILES = $(man_MANS) libcurl-symbols.md CLEANFILES = $(man_MANS) libcurl-symbols.md
nodist_MANS = $(man_MANS)
EXTRA_DIST = $(CURLPAGES) ABI.md symbols-in-versions symbols.pl \ EXTRA_DIST = $(CURLPAGES) ABI.md symbols-in-versions symbols.pl \
mksymbolsmanpage.pl CMakeLists.txt mksymbolsmanpage.pl CMakeLists.txt

1
docs/libcurl/opts/Makefile.am
View File

@ -30,7 +30,6 @@ include Makefile.inc
CURLPAGES = $(man_MANS:.3=.md) CURLPAGES = $(man_MANS:.3=.md)
endif endif
CLEANFILES = $(man_MANS) CLEANFILES = $(man_MANS)
nodist_MANS = $(man_MANS)
EXTRA_DIST = $(CURLPAGES) CMakeLists.txt EXTRA_DIST = $(CURLPAGES) CMakeLists.txt