From 3525fb689e21f3241224ef573f18f1f3c8606a9d Mon Sep 17 00:00:00 2001
From: scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Sat, 16 Aug 2008 22:49:42 +0000
Subject: oprava dvou preklepu (zjisteno pomoci gentoo QA)

git-svn-id: http://opensvn.csie.org/tuxanci_ng@208 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 CMakeLists.txt                       |  1 -
 packaging/gentoo/tuxanci-9999.ebuild | 17 +----------------
 src/base/path.h.in                   |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f36bd84..dcb66d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,7 +154,6 @@ ENDIF ( NOT Win )
 INCLUDE_DIRECTORIES (
 	${SDL_INCLUDE_DIR}
 	${SDLTTF_INCLUDE_DIR}
-	${SDL_INCLUDE_DIR}
 	${SDLIMAGE_INCLUDE_DIR}
 )
 IF ( NOT NO_Audio )
diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild
index 2255c0f..a05cbaa 100644
--- a/packaging/gentoo/tuxanci-9999.ebuild
+++ b/packaging/gentoo/tuxanci-9999.ebuild
@@ -26,26 +26,11 @@ DEPEND="!dedicated? (
 
 S="${WORKDIR}"/"${PN}"
 
-src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
-	# setting proper prefix
-	sed -i \
-		-e "s:PATH_DIR\tPREFIX:PATH_DIR:" src/base/path.h \
-		|| die "sed config.h failed!"
-	sed -i \
-		-e "s:share/tuxanci:"${GAMES_DATADIR}"/"${PN}":" src/base/path.h \
-		|| die "sed config.h failed!"
-	sed -i \
-		-e "s:CMAKE_INSTALL_DATADIR share/:CMAKE_INSTALL_DATADIR /usr/share/games/:" CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed!"
-}
-
 src_compile() {
 	local mycmakeargs
 	use alsa || mycmakeargs="${mycmakeargs} -DNO_Audio=1"
 	use dedicated && mycmakeargs="${mycmakeargs} -DServer=1"
-	mycmakeargs="${mycmakeargs} -DPREFIX=\\\"/usr/games\\\"	-DCMAKE_INSTALL_PREFIX:PATH=/usr/games"
+	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_PREFIX=/usr/games -DCMAKE_DATA_PATH=/usr/share/games/"
 	cmake-utils_src_compile
 }
 
diff --git a/src/base/path.h.in b/src/base/path.h.in
index 9eaddb7..696ca36 100644
--- a/src/base/path.h.in
+++ b/src/base/path.h.in
@@ -5,7 +5,7 @@
 	#define PATH_H
 	#ifndef __WIN32__
 		#define PREFIX					"@CMAKE_INSTALL_PREFIX@"
-		#define PATH_DIR	"@CMAKE_DATA_PATH@"	APPNAME	"/"
+		#define PATH_DIR	"@CMAKE_DATA_PATH@" "/"	APPNAME	"/"
 	#else
 		#define PREFIX 					".."
 		#define PATH_DIR	PREFIX	"/share/"	APPNAME	"/"
-- 
cgit v1.2.3