gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 03/254: Revert "src/Makefile.am: avoid explicit $<"


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 03/254: Revert "src/Makefile.am: avoid explicit $<"
Date: Sat, 17 Jun 2017 16:50:35 +0200

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

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

commit 7c145bb2a0a6c176ffdd65421a40026bcae07375
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Apr 20 09:16:12 2017 +0200

    Revert "src/Makefile.am: avoid explicit $<"
    
    This reverts commit 5b4cbcf11d5100ff793a8e9edbaa6fe1fc7495f5.
    
    Since it broke out-of-tree builds from tarballs. See discussion in #1432
---
 src/Makefile.am | 10 ++++++----
 1 file 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

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]