From a0b7f3908a2c5e68ed0fc3d30d7fac0b4731055c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 7 Apr 2022 03:37:19 +0300 Subject: [PATCH 37/37] Meson: Set FREECIV_STORAGE_DIR correctly in Haiku See osdn #43627 Signed-off-by: Marko Lindqvist --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 3b10a169e7..d019b966f4 100644 --- a/meson.build +++ b/meson.build @@ -53,10 +53,14 @@ if host_system == 'windows' priv_conf_data.set('DEFAULT_SCENARIO_PATH', '".;data/scenarios;@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios;@FREECIV_STORAGE_DIR@/scenarios;@DATADIR@/freeciv/scenarios"') else - pub_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') + if host_system == 'haiku' + pub_conf_data.set('FREECIV_STORAGE_DIR', '~/config/settings/freeciv') + else + pub_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') + endif priv_conf_data.set('LOCALEDIR', - join_paths(get_option('prefix'), - get_option('datadir'), 'locale')) + join_paths(get_option('prefix'), + get_option('datadir'), 'locale')) priv_conf_data.set('DEFAULT_DATA_PATH', '".:data:@FREECIV_STORAGE_DIR@/@DATASUBDIR@:@DATADIR@/freeciv"') -- 2.35.1