diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-03-28 22:12:47 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-03-28 22:12:47 +0100 |
| commit | 17eafb869c62f499960c1971a1d6fbfdeda84fc3 (patch) | |
| tree | 7ebe71b9ca03e2ad0cbffbcf882d3a2804b35675 /src | |
| parent | 4abb38a36ed41c70e8ee90cda4779c18d42f263b (diff) | |
address FIXME
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/Makefile.am | 10 | ||||
| -rw-r--r-- | src/util/taler-config.in | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 55b4fc5e..4e22f0a0 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -19,6 +19,16 @@ EXTRA_DIST = \ bin_SCRIPTS = \ taler-config +edit_script = $(SED) -e 's,%libdir%,$(libdir),'g $(NULL) + +taler-config: taler-config.in + rm -f $@ $@.tmp && \ + $(edit_script) $< >$@.tmp && \ + chmod a-w+x $@.tmp && \ + mv $@.tmp $@ + + + lib_LTLIBRARIES = \ libtalerutil.la diff --git a/src/util/taler-config.in b/src/util/taler-config.in index 212e52e1..b6561d87 100644 --- a/src/util/taler-config.in +++ b/src/util/taler-config.in @@ -7,15 +7,6 @@ if ! type gnunet-config >/dev/null; then 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 ":"}'` -if test -z $ASAN -then - A=`ldd @prefix@/lib/libtalerutil.so | grep libasan` && ASAN=`echo $A | awk '{print $3 ":"}'` -fi -export LD_PRELOAD=${ASAN}${LD_PRELOAD:-}:@prefix@/lib/libtalerutil.so +export LD_PRELOAD=${LD_PRELOAD:-}:%libdir%/libtalerutil.so exec gnunet-config "$@" |