- dalsi upravy build.sh pridano INSTALL_DATADIR_PATH, ktere by melo vyresit vetsinu problemu

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

8 files changed, 12 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7196bfd..eeafe07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,9 +52,10 @@ SET ( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} )
 # this specify location of additional cmake sources
 SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
 #various variables
-SET ( CMAKE_INSTALL_ETCDIR /etc )
+SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} )
 SET ( CMAKE_INSTALL_BINDIR bin )
-SET ( CMAKE_INSTALL_LIBDIR lib )
+SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} )
+SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} )
 # uninstall
 CONFIGURE_FILE (
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -169,8 +170,8 @@ ENDIF ( NOT NO_Audio )
 ###############################################################################
 IF ( Bundle )
 	SET ( CMAKE_CONF_PATH "../etc")
-	SET ( CMAKE_DATA_PATH "../share/")
-	SET ( LIB_INSTALL_DIR "../lib/")
+	SET ( CMAKE_DATA_PATH "../share")
+	SET ( LIB_INSTALL_DIR "../lib")
 	SET ( CMAKE_INSTALL_PREFIX "/")
 	SET ( CMAKE_INSTALL_BINDIR bin )
 	SET ( CMAKE_INSTALL_LIBDIR lib )
diff --git a/data/arena/CMakeLists.txt b/data/arena/CMakeLists.txt
index 62eb332..36cdae3 100644
--- a/data/arena/CMakeLists.txt
+++ b/data/arena/CMakeLists.txt
@@ -9,5 +9,5 @@
 ###############################################################################
 FILE ( GLOB files "*.map" )
 INSTALL ( FILES ${files}
-	DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/arena/ )
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ )
 ###############################################################################
\ No newline at end of file
diff --git a/data/font/CMakeLists.txt b/data/font/CMakeLists.txt
index d4d62e4..3c9e283 100644
--- a/data/font/CMakeLists.txt
+++ b/data/font/CMakeLists.txt
@@ -9,5 +9,5 @@
 ###############################################################################
 FILE ( GLOB files "*.ttf" )
 INSTALL ( FILES ${files}
-	DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/font/ )
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ )
 ###############################################################################
\ No newline at end of file
diff --git a/data/image/CMakeLists.txt b/data/image/CMakeLists.txt
index 1f4903e..4d428a1 100644
--- a/data/image/CMakeLists.txt
+++ b/data/image/CMakeLists.txt
@@ -9,5 +9,5 @@
 ###############################################################################
 FILE ( GLOB files "*.png" )
 INSTALL ( FILES ${files}
-	DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/images/ )
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/images/ )
 ###############################################################################
\ No newline at end of file
diff --git a/data/lang/CMakeLists.txt b/data/lang/CMakeLists.txt
index c3640bf..749a747 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_DATA_PATH}/${APPNAME}/lang/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/lang/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/data/music/CMakeLists.txt b/data/music/CMakeLists.txt
index 0469b04..140cbf3 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_DATA_PATH}/${APPNAME}/music/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/data/sound/CMakeLists.txt b/data/sound/CMakeLists.txt
index fd208e4..9e60aa7 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_DATA_PATH}/${APPNAME}/sound/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/packaging/linux/build.sh b/packaging/linux/build.sh
index 4825e0b..80dd7be 100755
--- a/packaging/linux/build.sh
+++ b/packaging/linux/build.sh
@@ -18,6 +18,7 @@ fi
 ###############################################################################
 # ARGUMENT PASSING
 ###############################################################################
+VERSION="9999"
 while getopts v:s arg
 do
 	case $arg in