[GNUnet-SVN] [gnunet] 21/30: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX.

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit 8f07aace2f2842b506350e608616c8055a2c71f9
Author: Hartmut Goebel <address@hidden>
AuthorDate: Sun Mar 3 02:10:13 2019 +0100

    gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX.
    
    This helps keeping environments concise and functional package
    managers like guix this will ensure `gnunet-uri` from the same
    environment is used.
---
 src/util/Makefile.am | 2 +-
 src/util/gnunet-qr.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 02dede372..548af6305 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -283,7 +283,7 @@ gnunet_qr_SOURCES = \
   gnunet-qr.c \
   gnunet-qr-utils.h
 gnunet_qr_LDFLAGS= $(libzbar_LIBS)
-gnunet_qr_CFLAGS = $(libzbar_CFLAGS)
+gnunet_qr_CFLAGS = $(libzbar_CFLAGS) -DBINDIR=\"@bindir@/\"
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
diff --git a/src/util/gnunet-qr.c b/src/util/gnunet-qr.c
index c8919dae4..ea0e0fea2 100644
--- a/src/util/gnunet-qr.c
+++ b/src/util/gnunet-qr.c
@@ -132,11 +132,11 @@ int main (int argc, char **argv)
     if (configuration == NULL) {
       char* command_args[] = {"gnunet-uri", data, NULL };
       LOG("Running `gnunet-uri %s`\n", data);
-      rc = fork_and_exec("gnunet-uri", command_args);
+      rc = fork_and_exec(BINDIR "gnunet-uri", command_args);
     } else {
       char* command_args[] = {"gnunet-uri", "-c", configuration, data, NULL };
       LOG("Running `gnunet-uri -c '%s' %s`\n", configuration, data);
-      rc = fork_and_exec("gnunet-uri", command_args);
+      rc = fork_and_exec(BINDIR "gnunet-uri", command_args);
     };
 
     if (rc != 0) {

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