- dalsi zmena v instalaci (prehlednutej docdir)

- nejprve nez budete kompilovat udelejte # make uninstall


git-svn-id: http://opensvn.csie.org/tuxanci_ng@220 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

11 files changed, 33 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae73f41..8894498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,8 +13,9 @@
 # -DApple=1			# build apple port
 # -DCMAKE_INSTALL_PREFIX=/bla/	# install prefix
 # -DCMAKE_DATA_PATH=/other/bla/	# install path for data
-# -DCMAKE_CONF_PATH=/etc	# install path for data
-# -DLIB_INSTALL_DIR=/other/bla	# install path for data
+# -DCMAKE_CONF_PATH=/etc	# install path for conf
+# -DLIB_INSTALL_DIR=/other/bla	# install path for lib
+# -DCMAKE_DOC_PATH=/other/bla	# install path for doc
 ###############################################################################
 # IMPORTANT DEFINITIONS [PREFIX,...]
 ###############################################################################
@@ -22,6 +23,7 @@ SET ( TUXANCI_VERSION "9999" CACHE STRING "Version" )
 SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
 # data because some distributions want different data placement
 SET ( CMAKE_CONF_PATH "/etc" CACHE PATH "Config path prefix" )
+SET ( CMAKE_DOC_PATH "/usr/local/" CACHE PATH "Data path prefix" )
 SET ( CMAKE_DATA_PATH "/usr/local/share/" CACHE PATH "Data path prefix" )
 SET ( LIB_INSTALL_DIR "/usr/local/lib/" CACHE PATH "Library path prefix" )
 SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" )
@@ -56,6 +58,7 @@ SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} )
 SET ( CMAKE_INSTALL_BINDIR bin )
 SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} )
 SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} )
+SET ( CMAKE_INSTALL_DOCDIR ${CMAKE_DOC_PATH} )
 # uninstall
 CONFIGURE_FILE (
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -138,11 +141,13 @@ IF ( WIN )
 	# noone wants to debug in windows
 	SET ( CMAKE_BUILD_TYPE Release )
 	# override basic directory placement
-	SET ( CMAKE_CONF_PATH "../${APPNAME}/etc/" )
-	SET ( CMAKE_DATA_PATH "../${APPNAME}/share/" )
-	SET ( LIB_INSTALL_DIR "../${APPNAME}/bin/" )
-	SET ( CMAKE_INSTALL_PREFIX "../")
+	SET ( CMAKE_CONF_PATH "${APPNAME}/etc/" )
+	SET ( CMAKE_DATA_PATH "${APPNAME}/share/" )
+	SET ( CMAKE_DOC_PATH "${APPNAME}/doc/" )
+	SET ( LIB_INSTALL_DIR "${APPNAME}/bin/" )
+	SET ( CMAKE_INSTALL_PREFIX "./")
 	SET ( CMAKE_INSTALL_BINDIR ${APPNAME}/bin )
+	SET ( CMAKE_INSTALL_DOCDIR ${APPNAME}/doc )
 	SET ( CMAKE_INSTALL_LIBDIR ${APPNAME}/bin )
 	SET ( CMAKE_INSTALL_DATADIR ${APPNAME}/share/ )
 	SET ( CMAKE_INSTALL_ETCDIR ${APPNAME}/etc )
@@ -174,12 +179,14 @@ ENDIF ( NOT NO_Audio )
 IF ( Bundle )
 	SET ( CMAKE_CONF_PATH "../etc")
 	SET ( CMAKE_DATA_PATH "../share")
+	SET ( CMAKE_DOC_PATH "../doc")
 	SET ( LIB_INSTALL_DIR "../lib")
 	SET ( CMAKE_INSTALL_PREFIX "/")
 	SET ( CMAKE_INSTALL_BINDIR bin )
 	SET ( CMAKE_INSTALL_LIBDIR lib )
 	SET ( CMAKE_INSTALL_DATADIR share )
 	SET ( CMAKE_INSTALL_ETCDIR etc )
+	SET ( CMAKE_INSTALL_DOCDIR doc )
 	CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${WORKDIR}/base/path.h )
 ENDIF ( Bundle )
 ###############################################################################
@@ -208,11 +215,11 @@ ADD_SUBDIRECTORY ( src )
 # path which user send us
 ADD_SUBDIRECTORY ( data )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE
-	DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS
-	DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README
-	DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
 # windows quirk
 IF ( NOT Server )
 	IF ( Win )
diff --git a/README b/README
index 34af75f..98491c4 100644
--- a/README
+++ b/README
@@ -91,9 +91,9 @@ HOWTO COMPILE
 		# -DApple=1			# build apple port
 		# -DCMAKE_INSTALL_PREFIX=/bla/	# install prefix
 		# -DCMAKE_DATA_PATH=/other/bla/	# install path for data
-		# -DCMAKE_CONF_PATH=/etc	# install path for data
-		# -DLIB_INSTALL_DIR=/other/bla	# install path for data
-
+		# -DCMAKE_CONF_PATH=/etc	# install path for conf. files
+		# -DLIB_INSTALL_DIR=/other/bla	# install path for libraries
+		# -DCMAKE_DOC_PATH=/other/bla	# install path for doc
 
 GAME USAGE
 ==========
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2d2c95f..daac5db 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -15,10 +15,10 @@ ADD_SUBDIRECTORY ( sound )
 ###############################################################################
 IF ( NOT Server )
 	INSTALL ( FILES tuxanci.desktop
-		DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/)
+		DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/)
 	IF ( NOT Win )
 		INSTALL ( FILES tuxanci.ico
-			DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ )
+			DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
 	ENDIF ( NOT Win )
 ENDIF ( NOT Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/arena/CMakeLists.txt b/data/arena/CMakeLists.txt
index 36cdae3..aa57bf3 100644
--- a/data/arena/CMakeLists.txt
+++ b/data/arena/CMakeLists.txt
@@ -9,5 +9,5 @@
 ###############################################################################
 FILE ( GLOB files "*.map" )
 INSTALL ( FILES ${files}
-	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ )
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/arena/ )
 ###############################################################################
\ No newline at end of file
diff --git a/data/font/CMakeLists.txt b/data/font/CMakeLists.txt
index 14e173b..e1ed47d 100644
--- a/data/font/CMakeLists.txt
+++ b/data/font/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT Server )
 	FILE ( GLOB files "*.ttf" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/font/ )
 ENDIF ( NOT Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/image/CMakeLists.txt b/data/image/CMakeLists.txt
index 48a7e27..703df68 100644
--- a/data/image/CMakeLists.txt
+++ b/data/image/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT Server )
 	FILE ( GLOB files "*.png" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/images/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/images/ )
 ENDIF ( NOT Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/lang/CMakeLists.txt b/data/lang/CMakeLists.txt
index 749a747..f4bc71d 100644
--- a/data/lang/CMakeLists.txt
+++ b/data/lang/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT NO_Audio )
 	FILE ( GLOB files "*.lang" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/lang/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/lang/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/data/music/CMakeLists.txt b/data/music/CMakeLists.txt
index 140cbf3..0818994 100644
--- a/data/music/CMakeLists.txt
+++ b/data/music/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT NO_Audio )
 	FILE ( GLOB files "*.ogg" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/music/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/data/sound/CMakeLists.txt b/data/sound/CMakeLists.txt
index 9e60aa7..51134a3 100644
--- a/data/sound/CMakeLists.txt
+++ b/data/sound/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT NO_Audio )
 	FILE ( GLOB files "*.ogg" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/sound/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/src/base/path.h.in b/src/base/path.h.in
index c9f9a53..5333ae8 100644
--- a/src/base/path.h.in
+++ b/src/base/path.h.in
@@ -4,16 +4,16 @@
 	#define TUXANCI_VERSION				"@TUXANCI_VERSION@"
 	#define PATH_H
 	#define PREFIX					"@CMAKE_INSTALL_PREFIX@"
-	#define PATH_DIR	"@CMAKE_DATA_PATH@"	"/"	APPNAME	"/"
 	#ifdef PUBLIC_SERVER
 		#define APPNAME					"tuxanci-server"
 		#define SERVER_CONFIG	"@CMAKE_CONF_PATH@" "/"	APPNAME	"/server.conf"
 	#else
 		#define APPNAME					"tuxanci"
 	#endif
+	#define PATH_DIR	"@CMAKE_DATA_PATH@"	"/"	APPNAME	"-" "@TUXANCI_VERSION@" "/"
 	// windows bug
 	#ifndef __WIN32__
-		#define PATH_MODULES 	"@LIB_INSTALL_DIR@" "/"	APPNAME	"/"
+		#define PATH_MODULES 	"@LIB_INSTALL_DIR@" "/"	APPNAME	"-" "@TUXANCI_VERSION@" "/"
 	#else
 		#define PATH_MODULES 	PREFIX	"/bin/"
 	#endif
@@ -24,7 +24,7 @@
 	#define PATH_MUSIC	PATH_DIR	"music/"
 	#define PATH_CONFIG	PATH_DIR	"conf/"
 	#define PATH_LANG	PATH_DIR	"lang/"
-	#define PATH_DATA	PATH_DIR	"doc/"
+	#define PATH_DOC	"@CMAKE_DOC_PATH@"	"doc/"	APPNAME	"-" "@TUXANCI_VERSION@" "/"
 	#define PATH_LOCALE	PREFIX		"share/locale/"
 	#include "main.h"
 #endif
diff --git a/src/screen/screen_credits.c b/src/screen/screen_credits.c
index 5a8e9b8..37f16ea 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/screen_credits.c
@@ -107,10 +107,10 @@ void initScreenCredits()
 
 	listWidgetLabel = newList();
 
-	if( tryExistFile(PATH_DATA SCREEN_CREDITS_FILE) == 0 )
+	if( tryExistFile(PATH_DOC SCREEN_CREDITS_FILE) == 0 )
 	{
 		creditExists = 1;
-		textFile = loadTextFile(PATH_DATA SCREEN_CREDITS_FILE);
+		textFile = loadTextFile(PATH_DOC SCREEN_CREDITS_FILE);
     	for( i = 0 ; i < textFile->text->count ; i++ )
 		{
 			widget_t *label;
@@ -129,7 +129,7 @@ void initScreenCredits()
 			creditExists = 0;
 			widget_t *label;
 			char *line;
-			line = "Credit file not found...";
+			line = "Credit file not found... %s/%s",PATH_DOC,SCREEN_CREDITS_FILE;
 			label = newWidgetLabel(line, WINDOW_SIZE_X/2, (WINDOW_SIZE_Y-100)+i*20,
 				WIDGET_LABEL_CENTER);