From d7bf4d58b46e4a36b9bde5670d9b859e9ecc9ff3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 23 Nov 2021 18:21:42 +0200 Subject: [PATCH 41/41] Meson: Fix build from release tarball Don't try to install files that are not part of the tarball. See osdn #43267 Signed-off-by: Marko Lindqvist --- meson.build | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/meson.build b/meson.build index 8be1c6d565..620035971f 100644 --- a/meson.build +++ b/meson.build @@ -1379,7 +1379,6 @@ install_data('data/helpdata.txt', 'data/trident.tilespec', 'data/hexemplio.tilespec', 'data/hex2t.tilespec', - 'data/amplio.tilespec', 'data/amplio2.tilespec', 'data/stdmusic.musicspec', 'data/stdsounds.soundspec', @@ -1477,7 +1476,6 @@ install_data('data/scenarios/british-isles.sav', 'data/scenarios/italy.sav', 'data/scenarios/japan.sav', 'data/scenarios/north_america.sav', - 'data/scenarios/tileset-demo.sav', 'data/scenarios/tutorial.sav', install_dir : join_paths(get_option('datadir'), 'freeciv/scenarios')) @@ -2236,40 +2234,6 @@ install_data('data/alio/burrowtubes.png', 'data/alio/tunnels.spec', install_dir : join_paths(get_option('datadir'), 'freeciv/alio')) -install_data('data/amplio/ancientcities.png', - 'data/amplio/ancientcities.spec', - 'data/amplio/explosions.png', - 'data/amplio/explosions.spec', - 'data/amplio/fog.png', - 'data/amplio/fog.spec', - 'data/amplio/grid.png', - 'data/amplio/grid.spec', - 'data/amplio/maglev.png', - 'data/amplio/maglev.spec', - 'data/amplio/medievalcities.png', - 'data/amplio/medievalcities.spec', - 'data/amplio/moderncities.png', - 'data/amplio/moderncities.spec', - 'data/amplio/nuke.png', - 'data/amplio/nuke.spec', - 'data/amplio/ocean.png', - 'data/amplio/ocean.spec', - 'data/amplio/select-alpha.png', - 'data/amplio/select.spec', - 'data/amplio/terrain1.png', - 'data/amplio/terrain1.spec', - 'data/amplio/terrain2.png', - 'data/amplio/terrain2.spec', - 'data/amplio/tiles.png', - 'data/amplio/tiles.spec', - 'data/amplio/units.png', - 'data/amplio/units.spec', - 'data/amplio/upkeep.png', - 'data/amplio/upkeep.spec', - 'data/amplio/water.png', - 'data/amplio/water.spec', - install_dir : join_paths(get_option('datadir'), 'freeciv/amplio')) - install_data('data/amplio2/activities.png', 'data/amplio2/activities.spec', 'data/amplio2/animals.png', -- 2.33.0