Update upstream source from tag 'upstream/1.45.90'

Update to upstream version '1.45.90'
with Debian dir d723a85d75b9a8958dee17b97673a3fd9a80e18c

1 files changed, 9 insertions, 6 deletions

diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
index cf8a21fc..7fb460dc 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -2,28 +2,31 @@
 
 if enable_docs
   assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+
+  merge_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py')
   settings_docs_input_xml = custom_target(
     'settings-docs-input.xml',
-    input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
+    input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
     output: 'settings-docs-input.xml',
     command: [
       python.path(),
-      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
+      merge_cmd,
       '@OUTPUT@',
       nm_property_infos_xml['nmcli'],
-      nm_settings_docs_xml_gir,
+      nm_settings_docs_xml_gir['nmcli'],
     ],
   )
 
+  gen_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py')
   settings_docs_source = custom_target(
     'settings-docs.h',
-    input: settings_docs_input_xml,
+    input: [gen_cmd, settings_docs_input_xml],
     output: 'settings-docs.h',
     command: [
       python.path(),
-      join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py'),
+      gen_cmd,
       '--output', '@OUTPUT@',
-      '--xml', '@INPUT@'
+      '--xml', settings_docs_input_xml
     ],
   )