diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-11-17 11:31:47 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-11-17 11:31:47 +0100 |
| commit | bd096d39285ef3225ca348ad5b772133675267bd (patch) | |
| tree | ff540fcf789584f119fa15f945892ef95c9bdbe5 | |
| parent | 21037d013d915e33c2dd3d1de5a34ed544ca6d48 (diff) | |
| parent | 2e16fbbae44bb596002417b674fbe8ca9dcffa12 (diff) | |
| download | exchange-bd096d39285ef3225ca348ad5b772133675267bd.tar.gz exchange-bd096d39285ef3225ca348ad5b772133675267bd.tar.bz2 exchange-bd096d39285ef3225ca348ad5b772133675267bd.zip | |
Merge branch 'master' of git+ssh://taler.net/exchange
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/util/Makefile.am | 16 | ||||
| -rw-r--r-- | src/util/taler-arm.in | 10 |
3 files changed, 2 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 30196d9fa..bab845dff 100644 --- a/configure.ac +++ b/configure.ac @@ -463,6 +463,7 @@ AC_CONFIG_FILES([Makefile src/json/Makefile src/pq/Makefile src/util/Makefile + src/util/taler-config src/wire/Makefile ]) AC_OUTPUT 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 "$@" |