From f76bec9928a819b0565597eeb6faf8b83b9062a2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 24 Mar 2022 17:53:18 +0200 Subject: [PATCH 38/38] Meson: Set LOCALEDIR correctly for Windows builds Windows builds need relative LOCALEDIR, so that they can be installed anywhere. See osdn #44127 Signed-off-by: Marko Lindqvist --- meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index b99b4f292c..d2fb3cee5c 100644 --- a/meson.build +++ b/meson.build @@ -18,9 +18,6 @@ pub_conf_data = configuration_data() liblua_conf_data = configuration_data() pub_conf_data.set('FREECIV_AI_MOD_LAST', 3) -priv_conf_data.set('LOCALEDIR', - join_paths(get_option('prefix'), - get_option('datadir'), 'locale')) priv_conf_data.set('BINDIR', join_paths(get_option('prefix'), get_option('bindir'))) @@ -47,6 +44,8 @@ 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')) priv_conf_data.set('DEFAULT_DATA_PATH', '".;data;@FREECIV_STORAGE_DIR@/@DATASUBDIR@;@DATADIR@/freeciv"') @@ -57,6 +56,9 @@ if host_system == 'windows' 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'), + get_option('datadir'), 'locale')) priv_conf_data.set('DEFAULT_DATA_PATH', '".:data:@FREECIV_STORAGE_DIR@/@DATASUBDIR@:@DATADIR@/freeciv"') -- 2.35.1