From 2d941130b2df776947e9632f8472b63f601b1eef Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 12 Apr 2009 15:17:14 +0200
Subject: Update build system to install desktop file and icon by default

---
 CMakeLists.txt                       | 2 ++
 data/CMakeLists.txt                  | 4 ++++
 packaging/gentoo/tuxanci-9999.ebuild | 7 ++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9e4353..c37b5c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,8 @@ SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
 SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} )
 SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" )
 SET ( CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" )
+SET ( CMAKE_INSTALL_ICONDIR "${CMAKE_INSTALL_PREFIX}/pixmaps" CACHE PATH "Icon path prefix" )
+SET ( CMAKE_INSTALL_DESKTOPDIR "${CMAKE_INSTALL_PREFIX}/applications" CACHE	PATH "Desktop file path prefix")
 SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} )
 SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} )
 SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} )
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index f808d92..12f1767 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -14,5 +14,9 @@ ADD_SUBDIRECTORY ( sound )
 IF ( NOT Server )
 	INSTALL ( FILES tuxanci.svg
 		DESTINATION ${CMAKE_INSTALL_DOCDIR}/ )
+	INSTALL ( FILES tuxanci.svg
+		DESTINATION ${CMAKE_INSTALL_ICONDIR}/ }
+	INSTALL ( FILES tuxanci.desktop
+		DESTINATION ${CMAKE_INSTALL_DESKTOPDIR}/ }
 ENDIF ( NOT Server )
 ###############################################################################
diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild
index 87e764d..8c6dc27 100644
--- a/packaging/gentoo/tuxanci-9999.ebuild
+++ b/packaging/gentoo/tuxanci-9999.ebuild
@@ -49,6 +49,8 @@ src_configure() {
 
 	mycmakeargs="${mycmakeargs}
 		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DCMAKE_INSTALL_ICONDIR=/usr/share/pixmaps/
+		-DCMAKE_INSTALL_DESKTOPDIR=/usr/share/applications/
 		-DCMAKE_DATA_PATH=${GAMES_DATADIR}
 		-DCMAKE_LOCALE_PATH=${GAMES_DATADIR_BASE}/locale/
 		-DCMAKE_DOC_PATH=${GAMES_DATADIR_BASE}/doc/${PF}
@@ -61,10 +63,5 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	if ! use dedicated; then
-		doicon data/${PN}.svg
-		domenu data/${PN}.desktop
-	fi
-
 	prepgamesdirs
 }
-- 
cgit v1.2.3