diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2023-12-22 14:36:19 +0800 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2023-12-22 14:36:19 +0800 |
| commit | afdccca78c95fe863f43614c92e4288a6bd79024 (patch) | |
| tree | b7b82c3e1df064f472c2e866a2b0205d888ae6da | |
| parent | 5c3c1b686f09fc1166a29a35f437fb91ff614ea7 (diff) | |
| download | exchange-afdccca78c95fe863f43614c92e4288a6bd79024.tar.gz exchange-afdccca78c95fe863f43614c92e4288a6bd79024.tar.bz2 exchange-afdccca78c95fe863f43614c92e4288a6bd79024.zip | |
fix #8019
| -rw-r--r-- | contrib/Makefile.am.in | 15 | ||||
| m--------- | contrib/gana | 0 | ||||
| -rwxr-xr-x | contrib/taler-terms-generator (renamed from contrib/taler-terms-generator.in) | 4 | ||||
| m--------- | contrib/wallet-core | 0 | ||||
| -rw-r--r-- | src/exchange/exchange.conf | 4 |
5 files changed, 5 insertions, 18 deletions
diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in index 57853e99e..73dee525b 100644 --- a/contrib/Makefile.am.in +++ b/contrib/Makefile.am.in @@ -35,22 +35,9 @@ bin_SCRIPTS = \ taler-bank-manage-testing -edit_script = $(SED) -e 's,%termsdir%,$(termsdir),'g -e 's,%localedir%,$(localedir),'g $(NULL) -taler-terms-generator: taler-terms-generator.in - rm -f $@ $@.tmp && \ - $(edit_script) $< >$@.tmp && \ - chmod a-w+x $@.tmp && \ - mv $@.tmp $@ - -CLEANFILES = \ - taler-terms-generator - EXTRA_DIST = \ locale/de/LC_MESSAGES/exchange-tos-v0.po \ - taler-bank-manage-testing \ - taler-terms-generator.in \ - taler-auditor-dbconfig \ - taler-exchange-dbconfig \ + $(bin_SCRIPTS) \ gana-generate.sh \ gana/gnu-taler-error-codes/registry.rec \ gana/gnu-taler-error-codes/Makefile \ diff --git a/contrib/gana b/contrib/gana -Subproject ec6c82120f0c3dca85429b86652fd25d3c25a88 +Subproject 91e5fd6edb1b3567fd151960059ffb911973a44 diff --git a/contrib/taler-terms-generator.in b/contrib/taler-terms-generator index 04f7ec3e5..38ccd6cc1 100755 --- a/contrib/taler-terms-generator.in +++ b/contrib/taler-terms-generator @@ -98,8 +98,8 @@ function failcat () # defaults AUTHOR="GNU Taler team" VERSION="exchange-tos-v0" -LOCALE_DIR="%localedir%" -OUTPUT="%termsdir%" +LOCALE_DIR=$(taler-config -s "LOCALEDIR" -f) +OUTPUT=$(taler-config -s "TERMS_DIR" -f) PAPER="a4" COPYRIGHT="2014-2023 Taler Systems SA (GPLv3+ or GFDL 1.3+)" diff --git a/contrib/wallet-core b/contrib/wallet-core -Subproject ec95723a68d36620aa66109c329437612383830 +Subproject 0c211082e0b8372f8fa1cef8102e477c7363d9b diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf index f7387ced3..40eeb5e13 100644 --- a/src/exchange/exchange.conf +++ b/src/exchange/exchange.conf @@ -126,13 +126,13 @@ WIREWATCH_IDLE_SLEEP_INTERVAL = 1 s SIGNKEY_LEGAL_DURATION = 2 years # Directory with our terms of service. -TERMS_DIR = $DATADIR/terms/ +TERMS_DIR = $TALER_DATA_HOME/terms/ # Etag / filename for the terms of service. TERMS_ETAG = exchange-tos-v0 # Directory with our privacy policy. -PRIVACY_DIR = $DATADIR/terms/ +PRIVACY_DIR = $TALER_DATA_HOME/terms/ # Etag / filename for the privacy policy. PRIVACY_ETAG = exchange-pp-v0 |