summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 19:39:48 +0000
committerscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 19:39:48 +0000
commit90c6e80cb6f357175cc9305b8426677466177cae (patch)
treebf0fa1d736db517b9dbbae983d8be7219f5a7bae
parentfe19ff7624236a0a3d606f8fa586a58769e9fe69 (diff)
- umistujeme server a client do ruznych slozek presnejs do tuxanci-ng a tuxanci-ng-server
git-svn-id: http://opensvn.csie.org/tuxanci_ng@97 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
-rw-r--r--CMakeLists.txt11
-rw-r--r--config.h2
2 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46d9bde..a187fa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,9 @@
# !! pri zmene zdrojovych souboru se podivejte co je treba delat do souboru !!
# !! CMakeLists.txt v adresari src !!
SET ( APPNAME "tuxanci-ng")
+IF ( NOT NO_Server )
+ SET ( APPNAME "tuxanci-ng-server" )
+ENDIF ( NOT NO_Server )
MESSAGE ( "<******************************>" )
MESSAGE ( "Configure for ${APPNAME} Started" )
MESSAGE ( "<******************************>" )
@@ -60,7 +63,9 @@ 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 )
@@ -70,9 +75,7 @@ INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/LICENCE DESTINATION ${CMAKE_INSTALL_DAT
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
-IF ( NOT NO_Server )
- INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} )
-ENDIF ( NOT NO_Server )
+
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/ )
diff --git a/config.h b/config.h
index 399fdfc..c85405b 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
-#define TUXANCI_NG_VERSION "svn96"
+#define TUXANCI_NG_VERSION "svn97"
#define DESTDIR "/usr/local/"