[taler-anastasis] branch master updated: fix anastasis-config

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 9c43d4f  fix anastasis-config
9c43d4f is described below

commit 9c43d4f53916e841cc8ce98b14aec61e08a15982
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Nov 18 20:47:37 2020 +0100

    fix anastasis-config
---
 src/lib/test_anastasis_api.c |  1 +
 src/util/Makefile.am         | 16 +++++++++++++---
 src/util/anastasis-config    | 17 -----------------
 src/util/anastasis-config.in | 12 ++++++++++++
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/lib/test_anastasis_api.c b/src/lib/test_anastasis_api.c
index 34f0146..62742f0 100644
--- a/src/lib/test_anastasis_api.c
+++ b/src/lib/test_anastasis_api.c
@@ -106,6 +106,7 @@ static struct GNUNET_OS_Process *merchantd;
  * Anastasis process.
  */
 static struct GNUNET_OS_Process *anastasisd;
+
 /**
  * Code for answering challenge
  */
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c6f2db5..d49ca7b 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -11,6 +11,16 @@ pkgcfgdir = $(prefix)/share/anastasis/config.d/
 pkgcfg_DATA = \
   paths.conf
 
+EXTRA_DIST = \
+  anastasis-config.in \
+  $(pkgcfg_DATA)
+
+anastasis-config: anastasis-config.in
+       rm -f $@ $@.tmp && \
+       $(edit_script) $< >$@.tmp && \
+       chmod a-w+x $@.tmp && \
+       mv $@.tmp $@
+
 bin_SCRIPTS = \
   anastasis-config
 
@@ -19,7 +29,7 @@ lib_LTLIBRARIES = \
 
 libanastasisutil_la_SOURCES = \
   anastasis_crypto.c \
-  os_installation.c 
+  os_installation.c
 libanastasisutil_la_LIBADD = \
   -lgnunetutil \
   $(LIBGCRYPT_LIBS) \
@@ -30,7 +40,7 @@ libanastasisutil_la_LDFLAGS = \
   -export-dynamic -no-undefined
 
 check_PROGRAMS = \
- test_anastasis_crypto 
+ test_anastasis_crypto
 
 TESTS = \
  $(check_PROGRAMS)
@@ -40,4 +50,4 @@ test_anastasis_crypto_SOURCES = \
 test_anastasis_crypto_LDADD = \
   -lgnunetutil \
   -ltalerutil \
-  libanastasisutil.la
\ No newline at end of file
+  libanastasisutil.la
diff --git a/src/util/anastasis-config b/src/util/anastasis-config
deleted file mode 100644
index 3031b69..0000000
--- a/src/util/anastasis-config
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-if ! type gnunet-config >/dev/null; then
-  echo "$0 needs gnunet-config to be installed"
-  exit 1
-fi
-
-# FIXME: not very portable ...
-# FIXME: should use "libdir" instead of prefix/lib, but somehow
-# the recursive expansion does not work ;-(.
-GC=`which gnunet-config`
-ASAN=""
-A=`ldd $GC | grep libasan` && ASAN=`echo $A | awk '{print $3 ":"}'`
-export LD_PRELOAD=${ASAN}${LD_PRELOAD:-}:/home/grothoff/lib/libanastasisutil.so
-exec gnunet-config "$@"
diff --git a/src/util/anastasis-config.in b/src/util/anastasis-config.in
new file mode 100644
index 0000000..0e94921
--- /dev/null
+++ b/src/util/anastasis-config.in
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -eu
+
+if ! type gnunet-config >/dev/null; then
+  echo "$0 needs gnunet-config to be installed"
+  exit 1
+fi
+
+GC=`which gnunet-config`
+export LD_PRELOAD=${LD_PRELOAD:-}:%libdir%/libanastasisutil.so
+exec gnunet-config "$@"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.