diff -ruN -U 8 warmux-11.04-orig/src/game/config.cpp warmux-11.04/src/game/config.cpp
--- warmux-11.04-orig/src/game/config.cpp	2011-04-18 16:43:40.000000000 -0400
+++ warmux-11.04/src/game/config.cpp	2011-04-30 11:07:29.000000000 -0400
@@ -199,16 +199,17 @@
 
 #else //Neither WIN32, ANDROID or __APPLE__
   data_dir     = GetEnv(Constants::ENV_DATADIR, INSTALL_DATADIR);
 #  ifdef ENABLE_NLS
   locale_dir   = GetEnv(Constants::ENV_LOCALEDIR, INSTALL_LOCALEDIR);
 #  endif
   ttf_filename = GetEnv(Constants::ENV_FONT_PATH, FONT_FILE);
   font_dir     = GetEnv(Constants::ENV_FONT_PATH, data_dir + PATH_SEPARATOR "font" PATH_SEPARATOR);
+#endif // __APPLE__, WIN32, ANDROID
 
   // To respect XDG Base Directory Specification from FreeDesktop
   // http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
 
   const char * c_config_dir = std::getenv("XDG_CONFIG_HOME");
   const char * c_data_dir = std::getenv("XDG_DATA_HOME");
 
   if (c_config_dir == NULL)
@@ -220,17 +221,16 @@
 
   if (c_data_dir == NULL) {
     personal_data_dir = GetHome() + "/.local/share";
   }
   else
     personal_data_dir = c_data_dir;
 
   personal_data_dir += "/wormux/";
-#endif
 
   std::string old_dir = GetOldPersonalDir();
   if (old_dir != "") {
     std::cout << "Moving " << old_dir << " to " << personal_data_dir << std::endl;
     if (old_dir != personal_data_dir)
       Rename(old_dir, personal_data_dir);
   }