aboutsummaryrefslogtreecommitdiff
path: root/src/util
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/util
parent4cecaf9d96ef62430ad81fe5e7a24ca68cd27095 (diff)
downloadgnunet-8f07aace2f2842b506350e608616c8055a2c71f9.tar.gz
gnunet-8f07aace2f2842b506350e608616c8055a2c71f9.zip
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/util')
-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 = \
283 gnunet-qr.c \ 283 gnunet-qr.c \
284 gnunet-qr-utils.h 284 gnunet-qr-utils.h
285gnunet_qr_LDFLAGS= $(libzbar_LIBS) 285gnunet_qr_LDFLAGS= $(libzbar_LIBS)
286gnunet_qr_CFLAGS = $(libzbar_CFLAGS) 286gnunet_qr_CFLAGS = $(libzbar_CFLAGS) -DBINDIR=\"@bindir@/\"
287 287
288plugin_LTLIBRARIES = \ 288plugin_LTLIBRARIES = \
289 libgnunet_plugin_test.la 289 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)
132 if (configuration == NULL) { 132 if (configuration == NULL) {
133 char* command_args[] = {"gnunet-uri", data, NULL }; 133 char* command_args[] = {"gnunet-uri", data, NULL };
134 LOG("Running `gnunet-uri %s`\n", data); 134 LOG("Running `gnunet-uri %s`\n", data);
135 rc = fork_and_exec("gnunet-uri", command_args); 135 rc = fork_and_exec(BINDIR "gnunet-uri", command_args);
136 } else { 136 } else {
137 char* command_args[] = {"gnunet-uri", "-c", configuration, data, NULL }; 137 char* command_args[] = {"gnunet-uri", "-c", configuration, data, NULL };
138 LOG("Running `gnunet-uri -c '%s' %s`\n", configuration, data); 138 LOG("Running `gnunet-uri -c '%s' %s`\n", configuration, data);
139 rc = fork_and_exec("gnunet-uri", command_args); 139 rc = fork_and_exec(BINDIR "gnunet-uri", command_args);
140 }; 140 };
141 141
142 if (rc != 0) { 142 if (rc != 0) {