diff --git a/CMakeLists.txt b/CMakeLists.txt index 7878b9356..975d963ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,4 +79,5 @@ add_subdirectory (iniparser) add_subdirectory (quicklist) add_subdirectory (critbit) add_subdirectory (src eressea) - +install(DIRECTORY res core DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml") +install(DIRECTORY scripts DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.lua") diff --git a/process/cron/run-eressea b/process/cron/run-eressea index b8c5f3075..cc33f8f1e 100755 --- a/process/cron/run-eressea +++ b/process/cron/run-eressea @@ -13,7 +13,7 @@ if [ -d $REPORTS ]; then fi mkdir $REPORTS $BIN/backup-eressea $GAME -$BIN/run-turn.sh $GAME +$BIN/run-turn $GAME if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then echo "server did not create orders for turn $TURN in game $GAME" exit 2 @@ -30,3 +30,4 @@ fi $BIN/compress.sh $GAME $TURN $BIN/sendreports.sh $GAME $BIN/backup-eressea $GAME +[ $GAME -lt 4 ] && $BIN/send-summary $GAME diff --git a/s/cmake-init b/s/cmake-init index 9b5a606f9..2a1813ec1 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -38,6 +38,6 @@ cmake .. \ -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \ -DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \ -DCMAKE_PREFIX_PATH=$PREFIX_PATH \ - -DCMAKE_INSTALL_PREFIX=$HOME/eressea $* + -DCMAKE_INSTALL_PREFIX=$HOME/eressea/server $* cd $OLDPWD diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fb1ccc8ef..b904b375a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -184,7 +184,7 @@ add_test( COMMAND $ runtests.lua ) -install(TARGETS eressea DESTINATION bin) +install(TARGETS eressea DESTINATION "bin") if (SQLITE3_FOUND) target_link_libraries(eressea ${SQLITE3_LIBRARIES})