[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 08/30: gnunet-qr: Use the `gnunet-uri` binary inst
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 08/30: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX. |
Date: |
Wed, 03 Apr 2019 13:53:49 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 70a749982e4ed34468d11affebe03a718facf3f4
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 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) {
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 02/30: gnunet-qr: Simplify verbose messaging., (continued)
- [GNUnet-SVN] [gnunet] 02/30: gnunet-qr: Simplify verbose messaging., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 05/30: Add Hartmut Goebel to the AUTHORS file., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 10/30: gnunet-qr: Use GNUNET_PROGRAM_run to simplify the code., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 03/30: Add helper lib "gnunet-qr-utils.h"., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 07/30: gnunet-qr: Add into Makefile.am and pofiles,, gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 01/30: gnunet-qr: Reimplement in C - yet only a proof of concept., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 25/30: contrib/guix: Add zbar as dependency for package gnunet., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 17/30: gnunet-qr: Actually run gnunet-uri., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 15/30: gnunet-qr: Simplify verbose messaging., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 18/30: Add Hartmut Goebel to the AUTHORS file., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 08/30: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX.,
gnunet <=
- [GNUnet-SVN] [gnunet] 12/30: contrib/guix: Add zbar as dependency for package gnunet., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 09/30: gnunet-qr: Update documentation and scripts to changed dependencies., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 19/30: configure.ac: Add check for libzbar (using pkgconfig)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 20/30: gnunet-qr: Add into Makefile.am and pofiles,, gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 16/30: Add helper lib "gnunet-qr-utils.h"., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 11/30: contrib/guix: Add package zbar (for gnunet-qr)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 26/30: gnunet-qr: Implement functionality of gnunet-uri, don't spawn., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 23/30: gnunet-qr: Use GNUNET_PROGRAM_run to simplify the code., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 24/30: contrib/guix: Add package zbar (for gnunet-qr)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 13/30: gnunet-qr: Implement functionality of gnunet-uri, don't spawn., gnunet, 2019/04/03