From a541463d6db068907dc190a208f6e8e5fdbecfc7 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 10 May 2022 04:50:03 +0300 Subject: [PATCH 36/36] Meson: Do not try to install stub.serv or stub.modpack See osdn #44555 Signed-off-by: Marko Lindqvist --- meson.build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 2442c91bbb..b8aa82217b 100644 --- a/meson.build +++ b/meson.build @@ -3096,11 +3096,18 @@ ruleset_files = [ 'units.ruleset', ] +install_data( + 'data/civ2civ3.modpack', + 'data/classic.modpack', + 'data/multiplayer.modpack', + 'data/alien.modpack', + 'data/sandbox.modpack', + 'data/civ1.modpack', + 'data/civ2.modpack', + install_dir : join_paths(get_option('datadir'), 'freeciv') + ) + foreach rs : rulesets - install_data( - join_paths('data', rs + '.modpack'), - install_dir : join_paths(get_option('datadir'), 'freeciv') - ) foreach rsf : ruleset_files install_data( join_paths('data', rs, rsf), @@ -3110,7 +3117,6 @@ foreach rs : rulesets endforeach install_data( - 'data/stub.serv', install_dir : join_paths(get_option('datadir'), 'freeciv') ) -- 2.35.1