Commit 8b03436d authored by Dan Fandrich's avatar Dan Fandrich
Browse files

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.
parent b8514216

docs/Makefile.am

+6 −3
Original line number Original line Diff line number Diff line
@@ -22,8 +22,11 @@ 




AUTOMAKE_OPTIONS = foreign no-dependencies

AUTOMAKE_OPTIONS = foreign no-dependencies





man_MANS = $(abs_builddir)/curl.1 curl-config.1

# EXTRA_DIST breaks with $(abs_builddir) so build it using this variable

noinst_man_MANS = mk-ca-bundle.1

# 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

GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html

PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf

PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf

MANDISTPAGES = curl.1.dist curl-config.1.dist

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    \

EXTRA_DIST = MANUAL BUGS CONTRIBUTE.md FAQ FEATURES INTERNALS.md SSLCERTS.md    \

 README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS KNOWN_BUGS   \

 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    \

 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           \

 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     \

 CHECKSRC.md CMakeLists.txt README.md CIPHERS.md INSTALL.cmake README.cmake     \