linux/howdy
0
0
Fork 0
mirror of https://github.com/boltgolt/howdy.git synced 2024-09-12 09:41:18 +02:00
Code Issues Projects Releases Wiki Activity

build: move datadir variable

Browse source
This commit is contained in:
Sayafdine Said 2023-07-02 14:36:34 +02:00
parent 19f5b8d4d6
commit a74ee5ae7c
No known key found for this signature in database
GPG key ID: 7567D43648C6E2F4
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
howdy/src/meson.build
View file

@ -5,7 +5,9 @@ endif
py = import('python').find_installation()
py.dependency()
datadir = get_option('prefix') / get_option('datadir') / 'howdy'
py_conf = configuration_data(paths_dict)
py_conf.set('data_dir', datadir)
py_paths = configure_file(
input: 'paths.py.in',

4
meson.build
View file

@ -1,9 +1,8 @@
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')
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')
config_path = join_paths(confdir, 'config.ini')
@ -12,7 +11,6 @@ paths_dict = {
'config_dir': confdir,
'dlib_data_dir': dlibdatadir,
'user_models_dir': usermodelsdir,
'data_dir': datadir,
'log_path': logpath,
}

1
meson.options
View file

@ -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('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('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('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')