summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 20:03:32 +0000
committerscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 20:03:32 +0000
commit62cec6f3e85e4763ffcbe84090ad1e745e51b9e6 (patch)
treec2e2231f681cd567da8fcb6b799936c6e222f132
parent90c6e80cb6f357175cc9305b8426677466177cae (diff)
- pro server nechceme opravdu nektera data zbytecne instalovat
git-svn-id: http://opensvn.csie.org/tuxanci_ng@98 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
-rw-r--r--CMakeLists.txt33
-rw-r--r--config.h2
2 files changed, 18 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a187fa0..2c62f98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,32 +63,33 @@ ADD_SUBDIRECTORY ( src )
# data !TODO
#MESSAGE ( STATUS "<Installing datafiles>" )
#MESSAGE ( STATUS "<******************************>" )
-IF ( NOT NO_Server )
- INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} )
-ENDIF ( NOT NO_Server )
+
IF ( NOT CMAKE_INSTALL_DATADIR )
SET ( CMAKE_INSTALL_DATADIR share/ )
ENDIF ( NOT CMAKE_INSTALL_DATADIR )
SET ( CMAKE_INSTALL_ETCDIR /etc )
-INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci-ng.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
+IF ( NOT NO_Server )
+ INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} )
+ELSE ( NOT NO_Server )
+ INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci-ng.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
+ INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/keytable.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/conf/ )
+ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/font/*.ttf" )
+ INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ )
+ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/image/*.png" )
+ INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/image/ )
+ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/lang/*.lang" )
+ INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/lang/ )
+ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/music/*.ogg" )
+ INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ )
+ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/sound/*.ogg" )
+ INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ )
+ENDIF ( NOT NO_Server )
INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/LICENCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/ )
INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/credits.en DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/ )
INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/README.sk DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) # meli by sme vytvorit jeste soubory authors a licence
-
-INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/keytable.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/conf/ )
FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/arena/*.map" )
INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ )
-FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/font/*.ttf" )
-INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ )
-FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/image/*.png" )
-INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/image/ )
-FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/lang/*.lang" )
-INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/lang/ )
-FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/music/*.ogg" )
-INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ )
-FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/sound/*.ogg" )
-INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ )
# uninstall
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
diff --git a/config.h b/config.h
index c85405b..f01e330 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
-#define TUXANCI_NG_VERSION "svn97"
+#define TUXANCI_NG_VERSION "svn98"
#define DESTDIR "/usr/local/"