[GNUnet-SVN] [gnurl] 56/205: build: fixed making man page in out-of-tree tarball builds

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.

commit b1dc45a82202f6e106a6ea2d834f001d46b8fc82
Author: Dan Fandrich <address@hidden>
AuthorDate: Thu Mar 9 22:45:40 2017 +0100

    build: fixed making man page in out-of-tree tarball builds
    
    The man page taken from the release package is found in a different
    location than if it's built from source. It must be referenced as $< in
    the rule to get its correct location in the VPATH.
---
 src/Makefile.am | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 19bab68ac..03c5e2c12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,19 +106,21 @@ $(MANPAGE):
 
 if HAVE_LIBZ
 # This generates the tool_hugehelp.c file in both uncompressed and
-# compressed formats
-$(HUGE): $(README) $(MANPAGE)  mkhelp.pl
+# 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): $(README) $(MANPAGE)  mkhelp.pl
+$(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

-- 
To stop receiving notification emails like this one, please contact
address@hidden