merchant

commit 437065b81cdf6c5675318265e5b1fc434d848587
parent 927fdb9b9af74a595e4b696a32d75b7e6596a0eb
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Tue,  5 May 2026 11:28:15 +0200

build: fix texi dependency meson

Diffstat:
M
doc/meson.build
 | 
3
++-
M
meson.build
 | 
10
+++++-----
M
src/backenddb/meson.build
 | 
6
++----

3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
@@ -22,7 +22,7 @@ install_man(
 
 fs = import('fs')
 
-fs.copyfile(
+merchant_texi_dep = fs.copyfile(
     'prebuilt' / 'texinfo' / 'taler-merchant.texi',
     'taler-merchant.texi',
 )
@@ -45,6 +45,7 @@ if makeinfo.found()
             '-o',
             '@OUTPUT0@',
         ],
+        dependencies: [merchant_texi_dep],
         install: true,
         install_dir: get_option('infodir'),
     )
diff --git a/meson.build b/meson.build
@@ -269,10 +269,7 @@ if not get_option('only-doc')
         'taler/taler_pq_lib.h',
         'TALER_PQ_query_param_array_blinded_denom_sig',
         required: true,
-        dependencies: [
-            talerpq_dep,
-            pq_dep,
-        ],
+        dependencies: [talerpq_dep, pq_dep],
     )
     private_config.set10('HAVE_TALERPQ', talerpq_dep.found())
 
@@ -367,7 +364,10 @@ if not get_option('only-doc')
     private_config.set_quoted('VERSION', meson.project_version())
     private_config.set_quoted('VCS_VERSION', 'mesonbuild')
     private_config.set_quoted('PACKAGE_BUGREPORT', 'taler@gnu.org')
-    configure_file(output: 'taler_merchant_config.h', configuration: private_config)
+    configure_file(
+        output: 'taler_merchant_config.h',
+        configuration: private_config,
+    )
     configuration_inc = include_directories('.')
 
     cdata.merge_from(private_config)
diff --git a/src/backenddb/meson.build b/src/backenddb/meson.build
@@ -1,8 +1,6 @@
 # This build file is in the public domain
 
-install_data('merchantdb-postgres.conf',
-  install_dir: pkgcfgdir
-)
+install_data('merchantdb-postgres.conf', install_dir: pkgcfgdir)
 
 subdir('sql-schema')
 
@@ -200,7 +198,7 @@ libtalermerchantdb = library(
         'lookup_order_charity.c',
         'upsert_donau_keys.c',
         'update_donau_instance.c',
-        'merchantdb_helper.c'
+        'merchantdb_helper.c',
     ],
     soversion: solibversions['libtalermerchantdb']['soversion'],
     version: solibversions['libtalermerchantdb']['soversion'],