curl-library
Re: Out-of-date man page in daily snapshot
Date: Mon, 13 Mar 2017 00:04:58 +0100 (CET)
On Sun, 12 Mar 2017, Dan Fandrich wrote:
> The docs/curl.1 file in the daily snapshot tarballs is not being regenerated
> for each release.
There's a flaw in the makefiles that makes the curl.1 not get rebuilt as it
should. It can be seen with this experiment:
$ touch docs/cmdline-opts/max-time.d
$ make
... and docs/curl.1 is not rebuilt! Turns out this is because we don't build
in docs/.
My proposed fix that seems to work appropriately:
diff --git a/Makefile.am b/Makefile.am
index b60cecaa2..1507a841e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,12 +149,12 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
$(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \
$(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ)
\
$(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ)
bin_SCRIPTS = curl-config
-SUBDIRS = lib src include
-DIST_SUBDIRS = $(SUBDIRS) tests packages docs scripts
+SUBDIRS = lib docs src include
+DIST_SUBDIRS = $(SUBDIRS) tests packages scripts
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc
# List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files
diff --git a/docs/Makefile.am b/docs/Makefile.am
index eee44d875..98ea29310 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -28,11 +28,12 @@ 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
HTMLPAGES = $(GENHTMLPAGES) index.html
-SUBDIRS = examples libcurl cmdline-opts
+SUBDIRS = libcurl cmdline-opts
+DIST_SUBDIRS = $(SUBDIRS) examples
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
\
-- / daniel.haxx.se ------------------------------------------------------------------- Unsubscribe: https://cool.haxx.se/list/listinfo/curl-library Etiquette: https://curl.haxx.se/mail/etiquette.htmlReceived on 2017-03-13