Merge branch 'debian/master' into ubuntu/master

1 files changed, 31 insertions, 9 deletions

diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index 517deffa..f8e6a823 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 if enable_nmcli
 
@@ -27,7 +27,9 @@ executable(
     readline_dep,
     libnm_libnm_aux_dep,
   ],
-  c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')],
+  c_args: [
+    '-DG_LOG_DOMAIN="nmcli"',
+  ],
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
@@ -45,14 +47,34 @@ generate_docs_nm_settings_nmcli = executable(
     libnmc_dep,
     libnm_libnm_aux_dep,
   ],
-  c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')],
+  c_args: [
+    '-DG_LOG_DOMAIN="nmcli"',
+  ],
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
 )
 
-generate_docs_nm_settings_nmcli_xml = custom_target(
-  'generate-docs-nm-settings-nmcli.xml',
-  output: 'generate-docs-nm-settings-nmcli.xml',
-  command: [ generate_docs_nm_settings_nmcli ],
-  capture: true,
-)
+if enable_docs
+  generate_docs_nm_settings_nmcli_xml = custom_target(
+    'generate-docs-nm-settings-nmcli.xml',
+    output: 'generate-docs-nm-settings-nmcli.xml',
+    command: [ generate_docs_nm_settings_nmcli ],
+    capture: true,
+  )
+
+  test(
+    'check-local-generate-docs-nm-settings-nmcli',
+    find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
+    args: [
+      source_root,
+      build_root,
+      'clients/cli/generate-docs-nm-settings-nmcli.xml',
+    ],
+  )
+else
+  settings_docs_source = configure_file(
+    input: 'generate-docs-nm-settings-nmcli.xml.in',
+    output: '@BASENAME@',
+    configuration: configuration_data(),
+  )
+endif