From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Sun, 3 Mar 2019 01:10:13 +0000 (+0100)
Subject: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX.
X-Git-Tag: v0.11.1~8^2~1^2~1^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70a749982e4ed34468d11affebe03a718facf3f4;p=oweals%2Fgnunet.git

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.
---

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index ba3c98ad1..98997efbd 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) {