From 02aa49cc36b91c19c21615d694d7b8b089044072 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 26 Jul 2021 16:16:52 +0200
Subject: install into usr/share/taler/exchange

---
 contrib/Makefile.am                    | 6 +++---
 debian/taler-exchange-offline.postinst | 4 ++--
 src/auditor/Makefile.am                | 2 +-
 src/auditor/taler-auditor.in           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 896880ff8..0d42e1df8 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = .
 
 # English (en)
-tosendir=$(pkgdatadir)/tos/en
+tosendir=$(datadir)/taler/exchange/tos/en
 
 # English (en)
-ppendir=$(pkgdatadir)/pp/en
+ppendir=$(datadir)/taler/exchange/pp/en
 
-rdatadir=$(pkgdatadir)
+rdatadir=$(datadir)/taler/exchange
 
 tosen_DATA = \
   tos/en/0.txt \
diff --git a/debian/taler-exchange-offline.postinst b/debian/taler-exchange-offline.postinst
index 0f436abbe..94f729f66 100644
--- a/debian/taler-exchange-offline.postinst
+++ b/debian/taler-exchange-offline.postinst
@@ -4,7 +4,7 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-TALEROFF_HOME="/var/lib/taler-exchange-offline"
+TALER_HOME="/var/lib/taler-exchange"
 
 # usage: lncfg user home target
 function lncfg() {
@@ -26,7 +26,7 @@ configure)
   if ! getent passwd taler-exchange-offline >/dev/null; then
     adduser --quiet --system \
       --ingroup taler-exchange-offline \
-      --home ${TALEROFF_HOME}/httpd taler-exchange-offline
+      --home ${TALER_HOME}/offline taler-exchange-offline
   fi
 
   lncfg taler-exchange-offline taler-exchange-offline /etc/taler/exchange-offline.conf
diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index 709c7f823..b040126cd 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -29,7 +29,7 @@ bin_SCRIPTS = \
   taler-auditor \
   taler-helper-auditor-render.py
 
-edit_script = $(SED) -e 's,%pkgdatadir%,$(pkgdatadir),'g $(NULL)
+edit_script = $(SED) -e 's,%datadir%,$(datadir),'g $(NULL)
 
 taler-auditor: taler-auditor.in
 	rm -f $@ $@.tmp && \
diff --git a/src/auditor/taler-auditor.in b/src/auditor/taler-auditor.in
index 26c5e2886..c8ea6b0c9 100644
--- a/src/auditor/taler-auditor.in
+++ b/src/auditor/taler-auditor.in
@@ -89,7 +89,7 @@ taler-helper-auditor-render.py \
     ${DIR}/coins.json \
     ${DIR}/deposits.json \
     ${DIR}/reserves.json \
-    ${DIR}/wire.json < %pkgdatadir%/auditor-report.tex.j2 > ${DIR}/auditor-report.tex
+    ${DIR}/wire.json < %datadir%/taler/exchange/auditor-report.tex.j2 > ${DIR}/auditor-report.tex
 cd ${DIR}
 pdflatex auditor-report.tex < /dev/null &> /dev/null || true
 pdflatex auditor-report.tex < /dev/null &> /dev/null || true
-- 
cgit v1.2.3