New upstream version 1.16.0 upstream/1.16.0

1 files changed, 7 insertions, 6 deletions

diff --git a/man/meson.build b/man/meson.build
index 21fac21d..a4ef3d9e 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -2,6 +2,7 @@ common_conf = configuration_data()
 common_conf.set('NM_VERSION', nm_version)
 common_conf.set('sysconfdir', nm_sysconfdir)
 common_conf.set('nmrundir', nm_pkgrundir)
+common_conf.set('nmstatedir', nm_pkgstatedir)
 common_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_default_main_auth_polkit)
 common_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_default)
 common_conf.set('NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT', config_default_logging_audit)
@@ -13,7 +14,7 @@ common = 'common.ent'
 common_ent_file = configure_file(
   input: common + '.in',
   output: common,
-  configuration: common_conf
+  configuration: common_conf,
 )
 
 xsltproc_options = [
@@ -27,7 +28,7 @@ xsltproc_options = [
   '--stringparam', 'man.th.extra1.suppress', '1',
   '--stringparam', 'man.authors.section.enabled', '0',
   '--stringparam', 'man.copyright.section.enabled', '0',
-  '--stringparam', 'man.th.title.max.length', '30'
+  '--stringparam', 'man.th.title.max.length', '30',
 ]
 
 docbook_xls = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
@@ -61,14 +62,14 @@ foreach man: mans
     command: xsltproc_options + [docbook_xls, '@INPUT@'],
     depend_files: common_ent_file,
     install: true,
-    install_dir: join_paths(nm_mandir, 'man' + man[1])
+    install_dir: join_paths(nm_mandir, 'man' + man[1]),
   )
 endforeach
 
 if enable_introspection
   mans = [
     ['nm-settings-keyfile', '5', nm_settings_keyfile_docs],
-    ['nm-settings', '5', nm_settings_docs]
+    ['nm-settings', '5', nm_settings_docs],
   ]
 
   if enable_ifcfg_rh
@@ -82,7 +83,7 @@ if enable_introspection
       output,
       input: man[2],
       output: output,
-      command: xsltproc_options + [join_paths(meson.current_source_dir(), man[0] + '.xsl'), '@INPUT@']
+      command: xsltproc_options + [join_paths(meson.current_source_dir(), man[0] + '.xsl'), '@INPUT@'],
     )
     content_files += input.full_path()
 
@@ -94,7 +95,7 @@ if enable_introspection
       output: output,
       command: xsltproc_options + [docbook_xls, '@INPUT@'],
       install: true,
-      install_dir: join_paths(nm_mandir, 'man' + man[1])
+      install_dir: join_paths(nm_mandir, 'man' + man[1]),
     )
   endforeach
 endif