diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-05-06 18:40:37 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-05-06 18:40:37 +0400 |
| commit | 71d0d1657d9dd40fb2bd3390e752db18327ecdf0 (patch) | |
| tree | 912025fb6cf4bdcd817eb4d336383b26dbde4d4e /CMakeLists.txt | |
| parent | 10d43143584a98ea4aece11c4fa753f71808afec (diff) | |
| download | rspamd-71d0d1657d9dd40fb2bd3390e752db18327ecdf0.tar.gz rspamd-71d0d1657d9dd40fb2bd3390e752db18327ecdf0.zip | |
* Add sample XML config
* Fix minor errors in logging initializing
* Fix installation of config files
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b93b49c7..ef8b40182 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -512,7 +512,7 @@ ENDIF(PERL_EXECUTABLE) CONFIGURE_FILE(config.h.in src/config.h) CONFIGURE_FILE(rspamc.pl.in rspamc.pl @ONLY) -CONFIGURE_FILE(rspamd.conf.sample conf/rspamd.conf.sample @ONLY) +CONFIGURE_FILE(rspamd.xml.sample conf/rspamd.xml.sample @ONLY) ######################### LINK SECTION ############################### ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CONTRIBSRC} ${TOKENIZERSSRC} @@ -659,12 +659,16 @@ IF(NOT EXISTS ${ETC_PREFIX}/rspamd/lotto.inc) INSTALL(FILES conf/lotto.inc DESTINATION ${ETC_PREFIX}/rspamd) ENDIF(NOT EXISTS ${ETC_PREFIX}/rspamd/lotto.inc) -INSTALL(FILES conf/rspamd.conf.sample DESTINATION ${ETC_PREFIX}/) +INSTALL(FILES conf/rspamd.xml.sample DESTINATION ${ETC_PREFIX}/) # Lua plugins INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${ETC_PREFIX}/rspamd/plugins)") INSTALL(DIRECTORY src/plugins/lua DESTINATION ${ETC_PREFIX}/rspamd/plugins PATTERN "*.lua") +# Lua config +INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${ETC_PREFIX}/rspamd/lua)") +INSTALL(DIRECTORY conf/lua DESTINATION ${ETC_PREFIX}/rspamd/ PATTERN "*.lua") + # Perl lib IF(PERL_EXECUTABLE) INSTALL(CODE "EXECUTE_PROCESS(COMMAND make install WORKING_DIRECTORY perl)") |