Small cleaning

This commit is contained in:
King_DuckZ 2020-09-06 17:47:54 +01:00
parent 41eeee4e69
commit a99976a242
2 changed files with 2 additions and 3 deletions

View file

@ -10,10 +10,9 @@ date_inc = include_directories('subprojects/date/include')
magic_enum_inc = include_directories('subprojects/magic_enum/include') magic_enum_inc = include_directories('subprojects/magic_enum/include')
full_config_dir = get_option('prefix') / get_option('sysconfdir') full_config_dir = get_option('prefix') / get_option('sysconfdir')
full_config_path = get_option('prefix') / get_option('sysconfdir') / meson.project_name() + '.conf'
subdir('src') subdir('src')
if meson.source_root() != full_config_dir if meson.source_root() != full_config_dir
install_data(sources: 'orotool.conf', install_dir: full_config_dir) install_data(sources: meson.project_name() + '.conf', install_dir: full_config_dir)
endif endif

View file

@ -45,7 +45,7 @@ endif
conf = configuration_data() conf = configuration_data()
conf.set_quoted('BASE_URL', base_url) conf.set_quoted('BASE_URL', base_url)
conf.set_quoted('CONFIG_FILE_PATH', get_option('prefix') / get_option('sysconfdir') / meson.project_name() + '.conf') conf.set_quoted('CONFIG_FILE_PATH', full_config_dir / meson.project_name() + '.conf')
conf.set_quoted('DEF_SQLITE_DB_NAME', get_option('def_sqlite_db_name')) conf.set_quoted('DEF_SQLITE_DB_NAME', get_option('def_sqlite_db_name'))
conf.set_quoted('PROJECT_NAME', meson.project_name()) conf.set_quoted('PROJECT_NAME', meson.project_name())
if get_option('buildtype') == 'debug' if get_option('buildtype') == 'debug'