mirror of
https://github.com/boltgolt/howdy.git
synced 2024-09-19 09:51:19 +02:00
build: move datadir variable
This commit is contained in:
parent
19f5b8d4d6
commit
a74ee5ae7c
3 changed files with 3 additions and 4 deletions
|
@ -5,7 +5,9 @@ endif
|
||||||
py = import('python').find_installation()
|
py = import('python').find_installation()
|
||||||
py.dependency()
|
py.dependency()
|
||||||
|
|
||||||
|
datadir = get_option('prefix') / get_option('datadir') / 'howdy'
|
||||||
py_conf = configuration_data(paths_dict)
|
py_conf = configuration_data(paths_dict)
|
||||||
|
py_conf.set('data_dir', datadir)
|
||||||
|
|
||||||
py_paths = configure_file(
|
py_paths = configure_file(
|
||||||
input: 'paths.py.in',
|
input: 'paths.py.in',
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
project('howdy', 'cpp', license: 'MIT', version: 'beta', meson_version: '>= 0.64.0')
|
project('howdy', 'cpp', license: 'MIT', version: 'beta', meson_version: '>= 0.64.0')
|
||||||
|
|
||||||
confdir = get_option('config_dir') != '' ? get_option('config_dir') : join_paths(get_option('sysconfdir'), 'howdy')
|
confdir = get_option('config_dir') != '' ? get_option('config_dir') : join_paths(get_option('prefix'), get_option('sysconfdir'), 'howdy')
|
||||||
dlibdatadir = get_option('dlib_data_dir') != '' ? get_option('dlib_data_dir') : join_paths(confdir, 'dlib-data')
|
dlibdatadir = get_option('dlib_data_dir') != '' ? get_option('dlib_data_dir') : join_paths(confdir, 'dlib-data')
|
||||||
usermodelsdir = get_option('user_models_dir') != '' ? get_option('user_models_dir') : join_paths(confdir, 'models')
|
usermodelsdir = get_option('user_models_dir') != '' ? get_option('user_models_dir') : join_paths(confdir, 'models')
|
||||||
datadir = get_option('data_dir') != '' ? get_option('data_dir') : join_paths(get_option('prefix'), get_option('datadir'), 'howdy')
|
|
||||||
logpath = get_option('log_path')
|
logpath = get_option('log_path')
|
||||||
|
|
||||||
config_path = join_paths(confdir, 'config.ini')
|
config_path = join_paths(confdir, 'config.ini')
|
||||||
|
@ -12,7 +11,6 @@ paths_dict = {
|
||||||
'config_dir': confdir,
|
'config_dir': confdir,
|
||||||
'dlib_data_dir': dlibdatadir,
|
'dlib_data_dir': dlibdatadir,
|
||||||
'user_models_dir': usermodelsdir,
|
'user_models_dir': usermodelsdir,
|
||||||
'data_dir': datadir,
|
|
||||||
'log_path': logpath,
|
'log_path': logpath,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ option('pam_dir', type: 'string', value: '', description: 'Set the pam_howdy des
|
||||||
option('config_dir', type: 'string', value: '', description: 'Set the howdy config directory')
|
option('config_dir', type: 'string', value: '', description: 'Set the howdy config directory')
|
||||||
option('dlib_data_dir', type: 'string', value: '', description: 'Set the dlib data directory')
|
option('dlib_data_dir', type: 'string', value: '', description: 'Set the dlib data directory')
|
||||||
option('user_models_dir', type: 'string', value: '', description: 'Set the user models directory')
|
option('user_models_dir', type: 'string', value: '', description: 'Set the user models directory')
|
||||||
option('data_dir', type: 'string', value: '', description: 'Set the howdy data directory')
|
|
||||||
option('log_path', type: 'string', value: '/var/log/howdy', description: 'Set the log file path')
|
option('log_path', type: 'string', value: '/var/log/howdy', description: 'Set the log file path')
|
||||||
option('install_in_site_packages', type: 'boolean', value: false, description: 'Install howdy python files in site packages')
|
option('install_in_site_packages', type: 'boolean', value: false, description: 'Install howdy python files in site packages')
|
||||||
option('py_sources_dir', type: 'string', value: '', description: 'Set the python sources directory')
|
option('py_sources_dir', type: 'string', value: '', description: 'Set the python sources directory')
|
Loading…
Reference in a new issue