aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rambler-co.ru>2011-02-04 20:34:50 +0300
committerVsevolod Stakhov <vsevolod@rambler-co.ru>2011-02-04 20:34:50 +0300
commit12f589d442290b13dae6a3cb0942150ae6d5eb93 (patch)
tree1ef724d2811626b86521afb99dc30e580b5cb450 /CMakeLists.txt
parent1a64321b3d8ac330edf45ae6d55c7800aee75d30 (diff)
downloadrspamd-12f589d442290b13dae6a3cb0942150ae6d5eb93.tar.gz
rspamd-12f589d442290b13dae6a3cb0942150ae6d5eb93.zip
Fix installation of lua configs.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79cf3b782..8f9084cf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(RSPAMD_MASTER_SITE_URL "http://bitbucket.org/vstakhov/rspamd")
SET(RSPAMD_USER "nobody")
SET(RSPAMD_GROUP "nobody")
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
OPTION(DEBUG_MODE "Enable debug output [default: ON]" ON)
OPTION(ENABLE_OPTIMIZATION "Enable optimization [default: OFF]" OFF)
@@ -513,7 +513,6 @@ IF(NOT DESTDIR)
ENDIF(NOT DESTDIR)
# Try to detect tip version from hg
-UNSET(ID CACHE)
SET(ID "unknown")
FIND_PROGRAM(HG "hg")
@@ -808,9 +807,9 @@ FOREACH(LUA_CONF ${LUA_CONFIGS})
IF(NOT IS_DIRECTORY ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${_rp})
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${_rp})")
ENDIF(NOT IS_DIRECTORY ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${_rp})
- IF(NOT EXISTS ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${_rp}/${LUA_CONF})
+ IF(NOT EXISTS ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${LUA_CONF})
INSTALL(FILES "conf/lua/${LUA_CONF}" DESTINATION etc/rspamd/lua/${_rp})
- ENDIF(NOT EXISTS ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${_rp}/${LUA_CONF})
+ ENDIF(NOT EXISTS ${DESTDIR}/${ETC_PREFIX}/rspamd/lua/${LUA_CONF})
ENDFOREACH(LUA_CONF)
# Perl lib