[taler-exchange] branch master updated: -fix minor dpkg build issues

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 3b0f6c86 -fix minor dpkg build issues
3b0f6c86 is described below

commit 3b0f6c864d55d5e9f6307eaeea25eec6c16d72b8
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Mon Sep 4 18:24:45 2023 +0200

    -fix minor dpkg build issues
---
 contrib/Makefile.am                                         | 2 +-
 src/templating/ORIGIN                                       | 8 +++++---
 src/templating/{Makefile.orig => mustach-original-Makefile} | 0
 src/templating/run-original-tests.sh                        | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 15106305..01a65c40 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = .
 
-tmplpkgdatadir = $(prefix)/share/taler/exchange/templates/
+tmplpkgdatadir = $(datadir)/taler/exchange/templates/
 dist_tmplpkgdata_DATA = \
   persona-exchange-unauthorized.en.must \
   persona-load-failure.en.must \
diff --git a/src/templating/ORIGIN b/src/templating/ORIGIN
index fafb0ae7..14902983 100644
--- a/src/templating/ORIGIN
+++ b/src/templating/ORIGIN
@@ -3,7 +3,9 @@ Cloned originally from https://gitlab.com/jobol/mustach/
 Changes:
 ========
 
-Renamed original Makefile to Makefile.orig and wrote Makefile.am for us.
+Renamed original Makefile to mustach-original-Makefile
+and wrote Makefile.am for us.
 
-Added run-original-tests.sh shell script as a wrapper around Makefile.org
-to us the original build process for the test suite.
+Added run-original-tests.sh shell script as a wrapper around
+mustach-original-Makefile to use the original build process for the test
+suite.
diff --git a/src/templating/Makefile.orig 
b/src/templating/mustach-original-Makefile
similarity index 100%
rename from src/templating/Makefile.orig
rename to src/templating/mustach-original-Makefile
diff --git a/src/templating/run-original-tests.sh 
b/src/templating/run-original-tests.sh
index 2debca76..f183736b 100755
--- a/src/templating/run-original-tests.sh
+++ b/src/templating/run-original-tests.sh
@@ -7,7 +7,7 @@ set -eu
 
 export CFLAGS="-g"
 
-make -f Makefile.orig mustach || exit 77
-make -f Makefile.orig clean || true
-make -f Makefile.orig basic-tests
-make -f Makefile.orig clean || true
+make -f mustach-original-Makefile mustach || exit 77
+make -f mustach-original-Makefile clean || true
+make -f mustach-original-Makefile basic-tests
+make -f mustach-original-Makefile clean || true

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.