Commit bbe1cd23 authored by Chris Mayo's avatar Chris Mayo

build: use python path method

The method was added to Meson in 0.50.0 which is the current minimum for
d-feet.
parent cca560b7
......@@ -21,10 +21,6 @@ gnome = import('gnome')
i18n = import('i18n')
python = import('python').find_installation('python3')
# FIXME: workaround for missing path method
# https://github.com/mesonbuild/meson/pull/4616
python_path = find_program('python3').path()
source_root = meson.current_source_dir()
data_dir = source_root / 'data'
......@@ -37,7 +33,7 @@ df_conf = configuration_data()
values = [
# python
['PYTHON', python_path],
['PYTHON', python.path()],
['pythondir', python.get_install_dir()],
# directories
['pkglibdir', df_prefix / df_pkglibdir],
......@@ -72,6 +68,6 @@ meson.add_install_script(
'meson_post_install.py',
df_datadir,
gio_schemasdir,
python_path,
python.path(),
python.get_install_dir(),
)
test_conf = configuration_data()
test_conf.set('PYTHON', python_path)
test_conf.set('PYTHON', python.path())
test_conf.set('DATA_DIR', data_dir)
test_conf.set('SRC_DIR', src_dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment