challenger

commit bf0e4b4a35a49996a40360f45508fe1cb05b8333
parent bb88bfc5390ed43eb496f4a2babe5e4e599f6a43
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 14 Nov 2023 17:12:46 +0100

install resource files

Diffstat:
M
bootstrap
 | 
11
+++++++++++
M
contrib/.gitignore
 | 
2
++
D
contrib/Makefile.am
 | 
33
---------------------------------
A
contrib/Makefile.am.in
 | 
18
++++++++++++++++++

4 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/bootstrap b/bootstrap
@@ -26,6 +26,17 @@ else
     echo "Uncrustify not detected, hook not installed. Please install uncrustify if you plan on doing development"
 fi
 
+# Generate Makefile.am in contrib/
+cd contrib
+rm -f Makefile.am
+find wallet-core/challenger/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext
+# Remove extra '\' at the end of the file
+truncate -s -2 Makefile.am.ext
+cat Makefile.am.in Makefile.am.ext >> Makefile.am
+# Prevent accidental editing of the generated Makefile.am
+chmod -w Makefile.am
+cd ..
+
 
 echo "$0: Running autoreconf"
 autoreconf -if
diff --git a/contrib/.gitignore b/contrib/.gitignore
@@ -1 +1,3 @@
 challenger.tag
+Makefile.am
+Makefile.am.ext
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
@@ -1,33 +0,0 @@
-# This file is in the public domain.
-
-SUBDIRS = .
-
-bin_SCRIPTS = \
-  challenger-dbconfig
-
-tmplpkgdatadir = $(prefix)/share/challenger/templates/
-
-
-%.must: wallet-core/challenger/%.must
-	cp $< $@
-
-dist_tmplpkgdata_DATA = \
- attempts-exhausted.en.must \
- attempts-exhausted.must \
- enter-address-form.en.must \
- enter-address-form.must \
- enter-tan-form.en.must \
- enter-tan-form.must \
- internal-error.en.must \
- internal-error.must \
- invalid-pin.en.must \
- invalid-pin.must \
- invalid-request.en.must \
- invalid-request.must \
- validation-unknown.en.must \
- validation-unknown.must
-
-EXTRA_DIST = \
-  gnunet.tag \
-  uncrustify.cfg \
-  uncrustify_precommit
diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in
@@ -0,0 +1,18 @@
+# This file is in the public domain.
+
+SUBDIRS = .
+
+bin_SCRIPTS = \
+  challenger-dbconfig
+
+tmplpkgdatadir = $(prefix)/share/challenger/templates/
+
+
+%.must: wallet-core/challenger/%.must
+	cp $< $@
+
+# This is for the templates imported from the wallet-core.git
+# prebuilt branch. This MUST be the last line in the
+# Makefile.am.in, as it will be combined with the
+# actual file list by 'bootstrap'!
+dist_tmplpkgdata_DATA = \