diff options
| author | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:30 +0200 |
| commit | 34bb501be08aa2b313d88e67d6e0a7e0a3f9cfa6 (patch) | |
| tree | 4e6220877828be4c6f261de09ec0cb2d80e32389 /src/libnm-client-impl/meson.build | |
| parent | bba2e4b4de668db525cbfdfc35292e5a0b51671a (diff) | |
New upstream version 1.47.90 upstream/1.47.90
Diffstat (limited to 'src/libnm-client-impl/meson.build')
| -rw-r--r-- | src/libnm-client-impl/meson.build | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 79ac9559..3dd2338a 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -158,7 +158,6 @@ if enable_introspection namespace: 'NM', identifier_prefix: nm_id_prefix, symbol_prefix: nm_id_prefix.to_lower(), - header: 'NetworkManager.h', export_packages: libnm_name, extra_args: [ '-DNETWORKMANAGER_COMPILATION', @@ -166,20 +165,20 @@ if enable_introspection install: true, ) - gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout() + gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout() if gi_typelib_path != '' gi_typelib_path = ':' + gi_typelib_path endif gi_typelib_path = meson.current_build_dir() + gi_typelib_path - ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH').stdout() + ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout() if ld_library_path != '' ld_library_path = ':' + ld_library_path endif ld_library_path = meson.current_build_dir() + ld_library_path - gen_infos_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py') - gen_gir_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py') + gen_infos_cmd = files(source_root / 'tools' / 'generate-docs-nm-property-infos.py') + gen_gir_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-gir.py') names = [ 'dbus', 'nmcli', 'keyfile' ] if enable_ifcfg_rh @@ -191,7 +190,7 @@ if enable_introspection input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, output: 'nm-property-infos-' + name + '.xml', command: [ - python.path(), + python_path, gen_infos_cmd, name, '@OUTPUT@', @@ -207,7 +206,7 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, - python.path(), + python_path, gen_gir_cmd, '--lib-path', meson.current_build_dir(), '--gir', libnm_gir[0], |