Commit ee80b94c authored by Thomas Bechtold's avatar Thomas Bechtold

Merge branch 'pythonpath' into 'master'

Make python installation used configurable

See merge request !23
parents cca560b7 be215eb8
Pipeline #163087 passed with stages
in 5 minutes and 26 seconds
......@@ -11,6 +11,7 @@ df_prefix = get_option('prefix')
df_bindir = get_option('bindir')
df_datadir = get_option('datadir')
df_libdir = get_option('libdir')
df_python = get_option('python')
df_pkgdatadir = df_datadir / df_name
df_pkglibdir = df_libdir / df_name
......@@ -19,11 +20,7 @@ df_namespace = 'org.gnome.dfeet'
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()
python = import('python').find_installation(df_python)
source_root = meson.current_source_dir()
......@@ -37,7 +34,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 +69,6 @@ meson.add_install_script(
'meson_post_install.py',
df_datadir,
gio_schemasdir,
python_path,
python.path(),
python.get_install_dir(),
)
option('tests', type: 'boolean', value: true, description: 'build tests')
option('python', type: 'string', value: 'python3', description: 'Python installation to use')
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