diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/util/Makefile.am | 10 | ||||
| -rw-r--r-- | src/util/taler-config.in | 11 |
3 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 58a209209..9750d3314 100644 --- a/configure.ac +++ b/configure.ac @@ -492,6 +492,5 @@ AC_CONFIG_FILES([Makefile src/mhd/Makefile src/pq/Makefile src/util/Makefile - src/util/taler-config ]) AC_OUTPUT diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 55b4fc5ed..4e22f0a08 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 212e52e12..b6561d872 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 "$@" |