summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-03 02:10:13 +0100
committerHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-13 18:22:07 +0100
commit70a749982e4ed34468d11affebe03a718facf3f4 (patch)
tree492bd9f6075cbc8d2848a1fd76089b8cad5ee903
parentd60866a5dfb1a3529d40ee4c445b891c68a362c8 (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.
-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 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) {