diff --git a/CMakeLists.txt b/CMakeLists.txt index 004248570..3e1b61e1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ add_subdirectory (storage) add_subdirectory (iniparser) add_subdirectory (quicklist) add_subdirectory (critbit) +add_subdirectory (process) add_subdirectory (src eressea) install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml") install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.json") diff --git a/process/CMakeLists.txt b/process/CMakeLists.txt new file mode 100644 index 000000000..7cbb10505 --- /dev/null +++ b/process/CMakeLists.txt @@ -0,0 +1,6 @@ +install(PROGRAMS create-orders backup-eressea run-turn send-zip-report +send-bz2-report compress.py compress.sh epasswd.py orders-process +orders-accept DESTINATION bin) + +install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS +FILES_MATCHING PATTERN "*.cron") diff --git a/s/install b/s/install index 5daa7cbc9..18cc2393f 100755 --- a/s/install +++ b/s/install @@ -20,13 +20,6 @@ BIN_DIR="build-$MACHINE-$CC-Debug" cd $ROOT/$BIN_DIR make install -[ -d $DEST/bin ] || mkdir -p $DEST/bin -install -v $ROOT/process/cron/*.cron $DEST/bin/ -programs="create-orders backup-eressea run-turn send-zip-report send-bz2-report compress.py compress.sh" -for prg in ${programs} ; do -install -v $ROOT/process/$prg $DEST/bin/ -done - # install crontab, but only on the eressea server: # in fact, never do this, because it overwrites hand-edits #WHOAMI=`whoami`@`hostname`