merchant

commit 7af0ac219c71d6440d715416e1bc9a4d9dd02a44
parent 7b9a365f421edf065a0a5aef3af8ce366949728d
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Fri, 10 Apr 2026 12:25:47 +0200

build: fix copyfile in dist

Diffstat:
M
contrib/meson.build
 | 
5
+++--
M
doc/meson.build
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
src/util/meson.build
 | 
5
+----

3 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/contrib/meson.build b/contrib/meson.build
@@ -27,9 +27,10 @@ fs = import('fs')
 
 foreach f : dist_tmplpkgdata_DATA
     f_must = '@0@.must'.format(f)
-    fs.copyfile('wallet-core' / 'backend' / '@0@.html'.format(f), f_must)
-    install_data(
+    fs.copyfile(
+        'wallet-core' / 'backend' / '@0@.html'.format(f),
         f_must,
+        install: true,
         install_dir: get_option('datadir') / 'taler-merchant' / 'templates',
     )
 endforeach
diff --git a/doc/meson.build b/doc/meson.build
@@ -1,31 +1,31 @@
 install_man(
-  [
-  'prebuilt'/'man'/'taler-merchant-benchmark.1',
-  'prebuilt'/'man'/'taler-merchant.conf.5',
-  'prebuilt'/'man'/'taler-merchant-config.1',
-  'prebuilt'/'man'/'taler-merchant-dbconfig.1',
-  'prebuilt'/'man'/'taler-merchant-dbinit.1',
-  'prebuilt'/'man'/'taler-merchant-depositcheck.1',
-  'prebuilt'/'man'/'taler-merchant-donaukeyupdate.1',
-  'prebuilt'/'man'/'taler-merchant-exchangekeyupdate.1',
-  'prebuilt'/'man'/'taler-merchant-httpd.1',
-  'prebuilt'/'man'/'taler-merchant-kyccheck.1',
-  'prebuilt'/'man'/'taler-merchant-passwd.1',
-  'prebuilt'/'man'/'taler-merchant-reconciliation.1',
-  'prebuilt'/'man'/'taler-merchant-report-generator.1',
-  'prebuilt'/'man'/'taler-merchant-report-generator-email.1',
-  'prebuilt'/'man'/'taler-merchant-rproxy-setup.1',
-  'prebuilt'/'man'/'taler-merchant-webhook.1',
-  'prebuilt'/'man'/'taler-merchant-wirewatch.1',
-  ],
+    [
+        'prebuilt' / 'man' / 'taler-merchant-benchmark.1',
+        'prebuilt' / 'man' / 'taler-merchant.conf.5',
+        'prebuilt' / 'man' / 'taler-merchant-config.1',
+        'prebuilt' / 'man' / 'taler-merchant-dbconfig.1',
+        'prebuilt' / 'man' / 'taler-merchant-dbinit.1',
+        'prebuilt' / 'man' / 'taler-merchant-depositcheck.1',
+        'prebuilt' / 'man' / 'taler-merchant-donaukeyupdate.1',
+        'prebuilt' / 'man' / 'taler-merchant-exchangekeyupdate.1',
+        'prebuilt' / 'man' / 'taler-merchant-httpd.1',
+        'prebuilt' / 'man' / 'taler-merchant-kyccheck.1',
+        'prebuilt' / 'man' / 'taler-merchant-passwd.1',
+        'prebuilt' / 'man' / 'taler-merchant-reconciliation.1',
+        'prebuilt' / 'man' / 'taler-merchant-report-generator.1',
+        'prebuilt' / 'man' / 'taler-merchant-report-generator-email.1',
+        'prebuilt' / 'man' / 'taler-merchant-rproxy-setup.1',
+        'prebuilt' / 'man' / 'taler-merchant-webhook.1',
+        'prebuilt' / 'man' / 'taler-merchant-wirewatch.1',
+    ],
 )
 
 fs = import('fs')
 
 fs.copyfile(
-  'prebuilt'/'texinfo'/'taler-merchant.texi',
-  'taler-merchant.texi',
-  )
+    'prebuilt' / 'texinfo' / 'taler-merchant.texi',
+    'taler-merchant.texi',
+)
 
 makeinfo = find_program('makeinfo', native: true, required: false)
 
@@ -54,13 +54,13 @@ endif
 
 install_emptydir(get_option('infodir') / 'taler-merchant-figures')
 install_data(
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'arch-api.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'merchant_first_login.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'no_default_account_yet.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'enter_instance_details.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'instance_iban_config.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'create_orders.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'payment_links.png',
-  'prebuilt'/'texinfo'/'taler-merchant-figures'/'merchant-db.png',
-  install_dir: get_option('infodir') / 'taler-merchant-figures',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'arch-api.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'merchant_first_login.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'no_default_account_yet.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'enter_instance_details.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'instance_iban_config.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'create_orders.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'payment_links.png',
+    'prebuilt' / 'texinfo' / 'taler-merchant-figures' / 'merchant-db.png',
+    install_dir: get_option('infodir') / 'taler-merchant-figures',
 )
diff --git a/src/util/meson.build b/src/util/meson.build
@@ -59,10 +59,7 @@ executable(
     install: true,
 )
 
-talermerchantutil_tests = [
-    'test_contract',
-    'test_validators',
-]
+talermerchantutil_tests = ['test_contract', 'test_validators']
 
 talermerchantutil_tests_installcheck = []