From 26838b053ae211a6e94091b901d56ba6b3d50788 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 3 Mar 2022 20:38:45 +0200 Subject: [PATCH 02/42] Install ruledit window icon to FREECIV_DATA_PATH See osdn #44017 Signed-off-by: Marko Lindqvist --- data/Makefile.am | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 1a163b5c7f..ddad1f91c8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -46,7 +46,16 @@ SERVER_FILES = endif endif -pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) +## Icons to be installed under FREECIV_DATA_PATH +if RULEDIT +DATAPATH_ICONS = freeciv-ruledit.png +RULEDITDIRS = ruledit +else +DATAPATH_ICONS = +RULEDITDIRS = +endif + +pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) $(DATAPATH_ICONS) EXTRA_DIST = \ $(SRV_RE_FILES) \ @@ -86,13 +95,7 @@ SERVERDATADIRS = endif endif -if RULEDIT -RULEDITDIRS = ruledit -ICONS = freeciv-ruledit.png -else -RULEDITDIRS = -ICONS = -endif +ICONS = $(DATAPATH_ICONS) if CLIENT ICONS += freeciv-client.png -- 2.34.1