diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-04-20 09:16:12 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-04-20 09:16:12 +0200 |
| commit | 7c145bb2a0a6c176ffdd65421a40026bcae07375 (patch) | |
| tree | 3ad0a181ce8f54c0bb68333a8f69fa8bf53ab191 | |
| parent | d88d054e947cb948e5da1a3ebe9cd21858f154d0 (diff) | |
Revert "src/Makefile.am: avoid explicit $<"
This reverts commit 5b4cbcf11d5100ff793a8e9edbaa6fe1fc7495f5.
Since it broke out-of-tree builds from tarballs. See discussion in #1432
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f4e88a04b..b59fb8786 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,19 +105,21 @@ $(MANPAGE): if HAVE_LIBZ # This generates the tool_hugehelp.c file in both uncompressed and -# compressed formats. +# compressed formats. $(MANPAGE) must be the first dependency so it +# can be referenced with $< which points to the correct location in +# the VPATH. $(HUGE): $(MANPAGE) $(README) $(MKHELP) echo '#include "tool_setup.h"' > $(HUGE) echo '#ifndef HAVE_LIBZ' >> $(HUGE) - $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) + $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE) echo '#else' >> $(HUGE) - $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) + $(NROFF) $< | $(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) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) + $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE) endif else # USE_MANUAL |