Set rpath correctly.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b18e6bdb72ae198a028d12d904e9d9f4504f367b..38b6544499c03897c03c3ec0ba2d849c0fabb2d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,19 @@ IF(NOT PLUGINSDIR)
        SET(PLUGINSDIR "${CMAKE_INSTALL_PREFIX}/share/rspamd")
 ENDIF(NOT PLUGINSDIR)
 
+# Set libdir
+IF(NOT LIBDIR)
+       SET(LIBDIR lib/rspamd)
+       IF(NOT CMAKE_INSTALL_RPATH)
+               SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIBDIR})
+       ENDIF(NOT CMAKE_INSTALL_RPATH)
+ENDIF(NOT LIBDIR)
+
+# Set includedir
+IF(NOT INCLUDEDIR)
+       SET(INCLUDEDIR include/rspamd)
+ENDIF(NOT INCLUDEDIR)
+
 ############################# INCLUDE SECTION #############################################
 
 INCLUDE(CheckIncludeFiles)
@@ -343,19 +356,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
        SET(CMAKE_INSTALL_RPATH "${PREFIX}/lib")        
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 
-# Set libdir
-IF(NOT LIBDIR)
-       SET(LIBDIR lib/rspamd)
-       IF(NOT CMAKE_INSTALL_RPATH)
-               SET(CMAKE_INSTALL_RPATH ${PREFIX}/${LIBDIR})
-       ENDIF(NOT CMAKE_INSTALL_RPATH)
-ENDIF(NOT LIBDIR)
-
-# Set includedir
-IF(NOT INCLUDEDIR)
-       SET(INCLUDEDIR include/rspamd)
-ENDIF(NOT INCLUDEDIR)
-
 # Now find libraries and headers
 
 # Find lua libraries