summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2017-04-26 23:02:42 +0200
committerDan Fandrich <dan@coneharvesters.com>2017-04-26 23:02:42 +0200
commit8b03436d3cc7b8b0359b5a658c38fe52484dcd61 (patch)
treef88a138382c771f40d81873189426def0083210b /docs
parentb85142164228abe15d6ca20a244ffb849c700e6c (diff)
downloadcurl-8b03436d3cc7b8b0359b5a658c38fe52484dcd61.tar.gz
Makefile: fix make dist
Commit 80a87e8a broke 'make dist' as it can't handle installing from absolute target names. Rearranged the dependencies so the absolute name is used for building but the relative name is use for distributing.
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 16836c650..21c1be048 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,8 +22,11 @@
AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = $(abs_builddir)/curl.1 curl-config.1
-noinst_man_MANS = mk-ca-bundle.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 = curl.1 mk-ca-bundle.1
+dist_man_MANS = curl-config.1
GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html
PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf
MANDISTPAGES = curl.1.dist curl-config.1.dist
@@ -39,7 +42,7 @@ CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1
EXTRA_DIST = MANUAL BUGS CONTRIBUTE.md FAQ FEATURES INTERNALS.md SSLCERTS.md \
README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS KNOWN_BUGS \
- BINDINGS.md $(man_MANS) HISTORY.md INSTALL INSTALL.md LICENSE-MIXING.md \
+ BINDINGS.md HISTORY.md INSTALL INSTALL.md LICENSE-MIXING.md \
README.netware MAIL-ETIQUETTE HTTP-COOKIES.md SECURITY.md RELEASE-PROCEDURE \
SSL-PROBLEMS.md HTTP2.md ROADMAP.md CODE_OF_CONDUCT.md CODE_STYLE.md \
CHECKSRC.md CMakeLists.txt README.md CIPHERS.md INSTALL.cmake README.cmake \