aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-11-14 15:51:06 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-11-14 15:51:06 +0100
commited9f4f1d1285df1ef2da0421585b1c48772c2a5d (patch)
tree9588327fa9fcbb438decb8a079ceb8e3faccb1a6
parent5e5d6b9bf5ff373f05574e20102e3bd1371957df (diff)
remove taler-arm, since we use taler-deployment-arm
-rw-r--r--src/util/Makefile.am16
-rw-r--r--src/util/taler-arm.in10
2 files changed, 1 insertions, 25 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c0713df8e..23f34f4ce 100644
--- a/src/util/Makefile.am
+++ b/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 = \
diff --git a/src/util/taler-arm.in b/src/util/taler-arm.in
deleted file mode 100644
index e624e85b5..000000000
--- a/src/util/taler-arm.in
+++ /dev/null
@@ -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 "$@"