diff options
| -rw-r--r-- | contrib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/templating/ORIGIN | 8 | ||||
| -rw-r--r-- | src/templating/mustach-original-Makefile (renamed from src/templating/Makefile.orig) | 0 | ||||
| -rwxr-xr-x | 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 15106305f..01a65c403 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 fafb0ae79..14902983a 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 index e902b2c71..e902b2c71 100644 --- a/src/templating/Makefile.orig +++ b/src/templating/mustach-original-Makefile diff --git a/src/templating/run-original-tests.sh b/src/templating/run-original-tests.sh index 2debca763..f183736b7 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 |