Skip to content

Commit

Permalink
docs: dist curl*.1 and install without perl
Browse files Browse the repository at this point in the history
Drop docs/mk-ca-bundle.1 from the tarball. It can be generated at will.

Closes #12959
Fixes #12921
Reported-by: Michael Forney
  • Loading branch information
bagder committed Feb 20, 2024
1 parent bdff974 commit ab027d9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 9 additions & 8 deletions docs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,21 @@ 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
# the curl.1 rule below runs first
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 \
Expand Down Expand Up @@ -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
Expand All @@ -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)

Expand Down
1 change: 0 additions & 1 deletion docs/libcurl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docs/libcurl/opts/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit ab027d9

Please sign in to comment.