- Added installation of game data, install required on *nix systems

- Updated desktop file to work better
- Install the desktop file to the standard location
- Install the icon as tmw.png in the standard pixmaps data dir

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 3e5a4b09..31c5298a 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -227,7 +227,7 @@ void CharSelectDialog::serverCharSelect()
         }
         char_ID = RFIFOL(2);
         memset(map_path, '\0', 480);
-        strcat(map_path, "data/maps/");
+        strcat(map_path, TMW_DATADIR "data/maps/");
         strncat(map_path, RFIFOP(6), 479 - strlen(map_path));
         map_address = RFIFOL(22);
         map_port = RFIFOW(26);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 625d348f..c9f7e571 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -64,7 +64,7 @@ Gui::Gui(Graphics *graphics):
     setTop(guiTop);
 
     // Set global font
-    guiFont = new gcn::ImageFont("data/graphics/gui/fixedfont.png",
+    guiFont = new gcn::ImageFont(TMW_DATADIR "data/graphics/gui/fixedfont.png",
             " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:@"
             "!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`"
             );