From 01391b26fc57ffc03f6642ae23105dfaa4029ca9 Mon Sep 17 00:00:00 2001
From: hikerstk <hikerstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 20 May 2008 01:12:58 +0000
Subject: [PATCH] Added missing updates to make the desktop file location
 independent (see r1919 on 0.5rc1 branch).

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/Makefile.am                   | 5 +++--
 data/supertuxkart_desktop.template | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 9f83a7f03..205ff78b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,7 +11,7 @@ pkgdata_DATA =  $(shell find $(srcdir) -name "*.data")        \
                 $(shell find $(srcdir) -name "*.projectile")  \
                 CREDITS licenses                              \
                 supertuxkart_32.xpm supertuxkart_64.xpm       \
-                supertuxkart.desktop
+                supertuxkart_desktop.template
 
 desktopdir = $(prefix)/share/applications
 desktop_DATA = supertuxkart.desktop
@@ -25,4 +25,5 @@ EXTRA_DIST = $(pkgdata_DATA)
 # since e.g. /usr/games might not be in the standard path
 
 supertuxkart.desktop: supertuxkart_desktop.template
-	cat supertuxkart_desktop.template | sed 's#BINDIR#@prefix@/games#' >supertuxkart.desktop
\ No newline at end of file
+	cat supertuxkart_desktop.template | sed 's#PREFIX#@prefix@#' >supertuxkart.desktop
+
diff --git a/data/supertuxkart_desktop.template b/data/supertuxkart_desktop.template
index 9082ea927..0580d0468 100644
--- a/data/supertuxkart_desktop.template
+++ b/data/supertuxkart_desktop.template
@@ -2,13 +2,13 @@
 Encoding=UTF-8
 Name=Supertuxkart
 Version=0.5
-Icon=supertuxkart_64.xpm
+Icon=PREFIX/share/pixmaps/supertuxkart_64.xpm
 Comment=A kart racing game
 Comment[fr_FR]=Un jeu de karting
 Comment[ro_RO]=Un joc de curse cu carturi
-Exec=/usr/games/supertuxkart --log=file
+Exec=PREFIX/games/supertuxkart --log=file
 Terminal=false
 StartupNotify=false
 Type=Application
-TryExec=BINDIR/supertuxkart
+TryExec=PREFIX/games/supertuxkart
 Categories=Game;ArcadeGame