Merge tag 'debian/1.42.0-1' into ubuntu/master

network-manager Debian release 1.42.0-1

1 files changed, 11 insertions, 12 deletions

diff --git a/src/nmcli/meson.build b/src/nmcli/meson.build
index be625fe0..7e3c44bf 100644
--- a/src/nmcli/meson.build
+++ b/src/nmcli/meson.build
@@ -45,10 +45,10 @@ executable(
 
 endif
 
-generate_docs_nm_settings_nmcli = executable(
-  'generate-docs-nm-settings-nmcli',
+gen_metadata_nm_settings_nmcli = executable(
+  'gen-metadata-nm-settings-nmcli',
   files(
-    'generate-docs-nm-settings-nmcli.c',
+    'gen-metadata-nm-settings-nmcli.c',
   ),
   dependencies: [
     libnm_dep,
@@ -70,25 +70,24 @@ generate_docs_nm_settings_nmcli = executable(
 )
 
 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 ],
+  gen_metadata_nm_settings_nmcli_xml = custom_target(
+    'gen-metadata-nm-settings-nmcli.xml',
+    output: 'gen-metadata-nm-settings-nmcli.xml',
+    command: [ gen_metadata_nm_settings_nmcli ],
     capture: true,
   )
 
   test(
-    'check-local-generate-docs-nm-settings-nmcli',
+    'check-local-gen-metadata-nm-settings-nmcli',
     find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
     args: [
-      source_root,
-      build_root,
-      'src/nmcli/generate-docs-nm-settings-nmcli.xml',
+      source_root + '/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in',
+      gen_metadata_nm_settings_nmcli_xml,
     ],
   )
 else
   gen_metadata_nm_settings_nmcli_xml = configure_file(
-    input: 'generate-docs-nm-settings-nmcli.xml.in',
+    input: 'gen-metadata-nm-settings-nmcli.xml.in',
     output: '@BASENAME@',
     configuration: configuration_data(),
   )