summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-09-25 09:44:14 +0200
committerThomas Haller <thaller@redhat.com>2019-09-25 09:45:01 +0200
commitbfcd0fbdc6fca236ea8898bfdccd699eefd47eb8 (patch)
treec0feaaf2ea4d14b8872059252817e169df9b3b4e
parentd791c3fba87572bb5a7a3b0b773d091d596fbacf (diff)
downloadNetworkManager-bfcd0fbdc6fca236ea8898bfdccd699eefd47eb8.tar.gz
build/meson: use python3 interpreter for "generate-setting-docs.py"
Fedora 32 drops "python" from the path. Hence "/usr/bin/env python" won't work anymore. Of course, who needs a way to invoke the interpreter that works accross different distributions! WTF. In this case, easy to work around. We run it from meson, so we have access to the Python 3 binary. Just call it directly like we do for autotools.
-rw-r--r--libnm/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm/meson.build b/libnm/meson.build
index 2e65d3bebf..0d7fb3acf2 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -280,7 +280,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
@@ -289,7 +289,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
depends: libnm_gir,
)
endif