Author: cazfi
Date: Sat Oct 24 22:32:25 2015
New Revision: 30200

URL: http://svn.gna.org/viewcvs/freeciv?rev=30200&view=rev
Log:
Install rulesets as part of ruledit installation even if server is not 
installed.

See patch #6469

Modified:
    branches/S2_6/data/Makefile.am

Modified: branches/S2_6/data/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/Makefile.am?rev=30200&r1=30199&r2=30200&view=diff
==============================================================================
--- branches/S2_6/data/Makefile.am      (original)
+++ branches/S2_6/data/Makefile.am      Sat Oct 24 22:32:25 2015
@@ -32,8 +32,7 @@
 CLIENT_FILES =
 endif
 
-if SERVER
-SERVER_FILES = \
+SRV_RE_FILES = \
        civ1.serv \
        civ2.serv \
        classic.serv \
@@ -42,11 +41,17 @@
        multiplayer.serv \
        civ2civ3.serv
 
+if SERVER
+SERVER_FILES = $(SRV_RE_FILES)
 SERVER_CONF = database.lua
-
+else
+if RULEDIT
+SERVER_FILES = $(SRV_RE_FILES)
+SERVER_CONF =
 else
 SERVER_FILES =
 SERVER_CONF =
+endif
 endif
 
 pkgsysconf_DATA = $(SERVER_CONF)
@@ -84,10 +89,15 @@
 CLIENTDATADIRS = 
 endif
 
+SRV_RE_DATADIRS = default classic civ1 civ2 experimental multiplayer civ2civ3 
nation
 if SERVER
-SERVERDATADIRS = default classic civ1 civ2 experimental multiplayer civ2civ3 
scenarios nation
+SERVERDATADIRS = $(SRV_RE_DATADIRS) scenarios
 else
-SERVERDATADIRS = 
+if RULEDIT
+SERVERDATADIRS = $(SRV_RE_DATADIRS)
+else
+SERVERDATADIRS =
+endif
 endif
 
 if CLIENT


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to