Revert "src/Makefile.am: avoid explicit $<"

This reverts commit 5b4cbcf11d5100ff793a8e9edbaa6fe1fc7495f5.

Since it broke out-of-tree builds from tarballs. See discussion in #1432

diff --git a/src/Makefile.am b/src/Makefile.am
index f4e88a04bbcfae7e56b3e3ef92fd5688c8c41112..b59fb8786a7b1c026ce47c99b705e2a533753a06 100644 (file)
--- 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