Index: server/savegame.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v
retrieving revision 1.78
diff -u -r1.78 savegame.c
--- server/savegame.c	2002/05/21 03:01:33	1.78
+++ server/savegame.c	2002/06/05 20:20:31
@@ -1815,18 +1815,28 @@
     }
 
     if (!has_capability("rulesetdir", savefile_options)) {
-      /* touch to prevent warnings */
-      section_file_lookup(file, "game.ruleset.techs");
-      section_file_lookup(file, "game.ruleset.units");
-      section_file_lookup(file, "game.ruleset.buildings");
-      section_file_lookup(file, "game.ruleset.terrain");
-      section_file_lookup(file, "game.ruleset.governments");
-      section_file_lookup(file, "game.ruleset.nations"); 
-      section_file_lookup(file, "game.ruleset.cities");
+      char *str2, *str =
+	  secfile_lookup_str_default(file, "default", "game.ruleset.techs");
 
-      sz_strlcpy(game.rulesetdir, 
-	       secfile_lookup_str_default(file, string,
-					  "game.ruleset.game"));
+#define T(x) \
+      str2 = secfile_lookup_str_default(file, "default", x); \
+      if (strcmp(str, str2) != 0) { \
+	freelog(LOG_NORMAL, _("Warning: Different rulesetdirs " \
+			      "('%s' and '%s') are no longer supported. " \
+			      "Using '%s'."), \
+			      str, str2, str); \
+      }
+
+      T("game.ruleset.units");
+      T("game.ruleset.buildings");
+      T("game.ruleset.terrain");
+      T("game.ruleset.governments");
+      T("game.ruleset.nations");
+      T("game.ruleset.cities");
+      T("game.ruleset.game");
+#undef T
+
+      sz_strlcpy(game.rulesetdir, str);
     } else {
       sz_strlcpy(game.rulesetdir, 
 	       secfile_lookup_str_default(file, string,