summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-03 02:10:13 +0100
committerChristian Grothoff <christian@grothoff.org>2019-04-03 13:43:15 +0200
commit8f07aace2f2842b506350e608616c8055a2c71f9 (patch)
tree0c4ddeddb0ea477105df80932ddca5bbe058c6de /src
parent4cecaf9d96ef62430ad81fe5e7a24ca68cd27095 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/util/Makefile.am2
-rw-r--r--src/util/gnunet-qr.c4
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) {