Merge branch 'master' of taler.net:exchange

src/util/Makefile.am

@@ -15,21 +15,7 @@ pkgcfg_DATA = \
 
 EXTRA_DIST = \
   paths.conf \
-  taler-config.in \
-  taler-arm.in
-
-templated_scripts = taler-config taler-arm
-dist_bin_SCRIPTS = $(templated_scripts)
-
-# See https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
-# for an explanation and why this ugliness is necessary.
-edit = sed -e 's|@libdir[@]|$(libdir)|g'
-$(templated_scripts): %: Makefile $(srcdir)/%.in
-	rm -f $@ $@.tmp
-	$(edit) '$(srcdir)/$@.in' >$@.tmp
-	chmod +x $@.tmp
-	chmod a-w $@.tmp
-	mv $@.tmp $@
+  taler-config.in
 
 if WALLET_ONLY
 lib_LTLIBRARIES = \

src/util/taler-arm.in

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-if ! type gnunet-config >/dev/null; then
-  echo "$0 needs gnunet-arm to be installed"
-  exit 1
-fi
-
-# FIXME: not very portable ...
-export LD_PRELOAD=@libdir@/libtalerutil.so
-exec gnunet-arm "$@"