diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-04-21 15:06:20 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-04-21 16:39:14 +0200 |
| commit | 3e5cef09d72cf5007b253aacf3a28b5b28fdb5bc (patch) | |
| tree | c37148d2cf6d3cfbf6c863000163f67b88883d8a | |
| parent | 49eee28822f8eef78b736097711fb798daf3a12b (diff) | |
| download | curl-3e5cef09d72cf5007b253aacf3a28b5b28fdb5bc.tar.gz | |
build: avoid GNU-makeism for docs/curl.1 use
... but keep out-of-tree builds functional.
Fixes #1432
| -rw-r--r-- | docs/cmdline-opts/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/cmdline-opts/Makefile.am b/docs/cmdline-opts/Makefile.am index bcd498a1f..e5762096d 100644 --- a/docs/cmdline-opts/Makefile.am +++ b/docs/cmdline-opts/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -MANPAGE = $(top_builddir)/docs/curl.1 +MANPAGE = $(abs_top_builddir)/docs/curl.1 include Makefile.inc diff --git a/src/Makefile.am b/src/Makefile.am index b59fb8786..14180f987 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,7 +101,7 @@ if USE_MANUAL # Here are the stuff to create a built-in manual $(MANPAGE): - cd $(top_builddir)/docs && $(MAKE) curl.1 + cd $(top_builddir)/docs && $(MAKE) if HAVE_LIBZ # This generates the tool_hugehelp.c file in both uncompressed and @@ -111,15 +111,15 @@ if HAVE_LIBZ $(HUGE): $(MANPAGE) $(README) $(MKHELP) echo '#include "tool_setup.h"' > $(HUGE) echo '#ifndef HAVE_LIBZ' >> $(HUGE) - $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE) + $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) echo '#else' >> $(HUGE) - $(NROFF) $< | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) + $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) echo '#endif /* HAVE_LIBZ */' >> $(HUGE) else # HAVE_LIBZ # This generates the tool_hugehelp.c file uncompressed only $(HUGE): $(MANPAGE) $(README) mkhelp.pl echo '#include "tool_setup.h"' > $(HUGE) - $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE) + $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) endif else # USE_MANUAL |