From f1b8e5b3b701b195b3fc7d1fd6625f284e4aa051 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 25 Sep 2023 02:01:51 +0300 Subject: [PATCH 50/50] Meson: Respect "localedir" option See osdn #48726 Signed-off-by: Marko Lindqvist --- meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 775ed62ee8..b2d28cfd9e 100644 --- a/meson.build +++ b/meson.build @@ -180,8 +180,7 @@ 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')) + priv_conf_data.set('LOCALEDIR', join_paths('.', get_option('localedir'))) priv_conf_data.set('DEFAULT_DATA_PATH', '".;data;@FREECIV_STORAGE_DIR@/@DATASUBDIR@;@DATADIR@/freeciv"') @@ -190,9 +189,7 @@ 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('LOCALEDIR', - join_paths(get_option('prefix'), - get_option('datadir'), 'locale')) + priv_conf_data.set('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) priv_conf_data.set('DEFAULT_DATA_PATH', '".:data:@FREECIV_STORAGE_DIR@/@DATASUBDIR@:@DATADIR@/freeciv"') -- 2.40.1