From 0af3ba1d8c859ac05957ec3803fbe6d0207d2ccd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 27 Mar 2022 15:17:59 +0300 Subject: [PATCH 44/44] Meson: Don't try to set FREECIV_STORAGE_DIR to fc_config.h It's set to public freeciv_config.h See osdn #44213 Signed-off-by: Marko Lindqvist --- meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/meson.build b/meson.build index d2fb3cee5c..3b10a169e7 100644 --- a/meson.build +++ b/meson.build @@ -42,7 +42,6 @@ else endif if host_system == 'windows' - priv_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') pub_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') priv_conf_data.set('LOCALEDIR', join_paths('.', get_option('datadir'), 'locale')) @@ -54,7 +53,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 - priv_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') pub_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') priv_conf_data.set('LOCALEDIR', join_paths(get_option('prefix'), -- 2.35.1