From 515cab3c2e26d5464355f4689e88f9232ffbc7c9 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 3 Mar 2022 20:38:45 +0200
Subject: [PATCH 02/39] Install ruledit window icon to FREECIV_DATA_PATH

See osdn #44017

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/Makefile.am | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 1a163b5c7f..337356e6be 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -46,7 +46,14 @@ 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
+else
+DATAPATH_ICONS =
+endif
+
+pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) $(DATAPATH_ICONS)
 
 EXTRA_DIST = \
 	$(SRV_RE_FILES) \
@@ -86,13 +93,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