Fixes to the new meson/ninja build system. Pretty close to working... I think.
This commit is contained in:
@@ -96,6 +96,9 @@ configure_file(
|
||||
'bindir': get_option('bindir'),
|
||||
'libdir': get_option('libdir'),
|
||||
'datadir': get_option('datadir'),
|
||||
'PYTHON': python3.full_path(),
|
||||
'PYTHON_PREFIX': python3.get_install_dir(),
|
||||
'pythondir': python3.get_install_dir(),
|
||||
}
|
||||
)
|
||||
|
||||
@@ -106,6 +109,7 @@ configure_file(
|
||||
'GETTEXT_PACKAGE': 'cthulhu',
|
||||
'prefix': get_option('prefix'),
|
||||
'datadir': get_option('datadir'),
|
||||
'localedir': get_option('datadir') / 'locale',
|
||||
}
|
||||
)
|
||||
|
||||
@@ -119,18 +123,13 @@ configure_file(
|
||||
'datadir': get_option('datadir'),
|
||||
'sysconfdir': get_option('sysconfdir'),
|
||||
'localstatedir': get_option('localstatedir'),
|
||||
'PACKAGE': 'cthulhu',
|
||||
'REVISION': run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip(),
|
||||
'LOUIS_TABLE_DIR': '/usr/share/liblouis/tables',
|
||||
}
|
||||
)
|
||||
|
||||
# Main executable script
|
||||
configure_file(
|
||||
input: 'cthulhu',
|
||||
output: 'cthulhu',
|
||||
copy: true,
|
||||
install: true,
|
||||
install_dir: get_option('bindir'),
|
||||
install_mode: 'rwxr-xr-x'
|
||||
)
|
||||
# Note: Main executable (cthulhu) is installed from src/cthulhu.py
|
||||
|
||||
# Install Python sources
|
||||
python3.install_sources(
|
||||
|
@@ -1 +1,9 @@
|
||||
# Main executable script
|
||||
install_data(
|
||||
'cthulhu.py',
|
||||
rename: 'cthulhu',
|
||||
install_dir: get_option('bindir'),
|
||||
install_mode: 'rwxr-xr-x'
|
||||
)
|
||||
|
||||
subdir('cthulhu')
|
Reference in New Issue
Block a user