diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2017-04-23 09:49:59 +0200 |
---|---|---|
committer | Dan Fandrich <dan@coneharvesters.com> | 2017-04-24 21:38:11 +0200 |
commit | 80a87e8abc535aadf28bd154fdf5d44e61ef2080 (patch) | |
tree | 490a127575a4c730e4e1db8f1898bfcd8bc5bb67 /docs | |
parent | c8ac0b6a7f9d308fcfe404d445a013b9a2c58845 (diff) |
Makefile: avoid use of GNU-specific form of $<
$< is only allowed in implicit rules in some non-GNU makes (e.g. BSD,
AIX) so avoid use elsewhere by referencing the dependent curl.1 file
directly instead. This is somewhat tricky because the file is supplied
in the packaged tar ball (but not in git) but must still be able to be
rebuilt when its dependencies change. The right thing must happen in
both tar ball and git source trees, as well as in both in-tree and
out-of-tree builds.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/Makefile.am | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index 7da7c0dea..16836c650 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = curl.1 curl-config.1 +man_MANS = $(abs_builddir)/curl.1 curl-config.1 noinst_man_MANS = mk-ca-bundle.1 GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf @@ -30,7 +30,9 @@ MANDISTPAGES = curl.1.dist curl-config.1.dist HTMLPAGES = $(GENHTMLPAGES) index.html -SUBDIRS = libcurl cmdline-opts +# Build targets in this file (.) before cmdline-opts to ensure that +# the curl.1 rule below runs first +SUBDIRS = libcurl . cmdline-opts DIST_SUBDIRS = $(SUBDIRS) examples CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1 @@ -47,7 +49,17 @@ MAN2HTML= roffit $< >$@ SUFFIXES = .1 .html .pdf -curl.1: +# $(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 +# build directory. +# +# First, seed the used copy of curl.1 with the prebuilt copy (in an out-of-tree +# build), then run make recursively to rebuild it only if its dependencies +# have changed. +$(abs_builddir)/curl.1: + if test "$(top_builddir)x" != "$(top_srcdir)x" -a -e "$(srcdir)/curl.1"; then \ + cp -fp "$(srcdir)/curl.1" $@; fi cd cmdline-opts && $(MAKE) html: $(HTMLPAGES) |