From 274a0741a14f855f34022fe9bdda3977b1f5b2a4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 28 Nov 2022 22:07:13 +0200 Subject: [PATCH 31/31] Meson: Substitute @FREECIV_STORAGE_DIR@ in fc_config.h Reported by ddeanbrown See osdn #46134 Signed-off-by: Marko Lindqvist --- meson.build | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 2f7eb0817d..682222e771 100644 --- a/meson.build +++ b/meson.build @@ -51,7 +51,22 @@ else endif if host_system == 'windows' - pub_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') + storage_dir = '"~\\\\.freeciv"' + storage_dir = '~\\\\.freeciv' +else + if host_system == 'haiku' + storage_dir = '"~/config/settings/freeciv"' + storage_dir = '~/config/settings/freeciv' + else + storage_dir = '"~/.freeciv"' + storage_dir = '~/.freeciv' + endif +endif + +pub_conf_data.set('FREECIV_STORAGE_DIR', storage_dir) +priv_conf_data.set('FREECIV_STORAGE_DIR', storage_dir) + +if host_system == 'windows' priv_conf_data.set('LOCALEDIR', join_paths('.', get_option('datadir'), 'locale')) @@ -62,11 +77,6 @@ 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 - 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')) -- 2.35.1