diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-16 23:05:15 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-16 23:05:15 +0100 |
| commit | 2e16fbbae44bb596002417b674fbe8ca9dcffa12 (patch) | |
| tree | 0a677408111e0e102204a2fc6f41226ae8197513 | |
| parent | 22441daf64bea4c5e212755f8754dd157c806514 (diff) | |
| parent | ed9f4f1d1285df1ef2da0421585b1c48772c2a5d (diff) | |
| download | exchange-2e16fbbae44bb596002417b674fbe8ca9dcffa12.tar.gz exchange-2e16fbbae44bb596002417b674fbe8ca9dcffa12.tar.bz2 exchange-2e16fbbae44bb596002417b674fbe8ca9dcffa12.zip | |
Merge branch 'master' of taler.net:exchange
| -rw-r--r-- | src/util/Makefile.am | 16 | ||||
| -rw-r--r-- | src/util/taler-arm.in | 10 |
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 "$@" |