diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fb2ce9b5f9e6b1565347d3760aa364dccd8bc01..7f91da91f9d445f4bb5e395dc0026d240e4971a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # Pre-requisites about cmake itself
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
@@ -10,14 +9,18 @@ endif(COMMAND cmake_policy)
 SET(CMAKE_MACOSX_RPATH 1)
 
 
-# The project name and the type of project
+# The project name
 PROJECT(wolf)
 
-# EXECUTABLE_OUTPUT_PATH & LIBRARY_OUTPUT_PATH are
-# supercede by LIBRARY_OUTPUT_DIRECTORY & RUNTIME_OUTPUT_DIRECTORY
-# which are properly set by catkin
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+
+string(COMPARE EQUAL "${CMAKE_BINARY_DIR}" "" result)
+IF(result)
+  SET(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ENDIF()
+message(STATUS "Binary path : " ${CMAKE_BINARY_DIR})
+
+SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 # We'll set the install prefix only is it's empty
 # which shouldn't be the case ...
@@ -25,9 +28,8 @@ string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "" result)
 IF(result)
   # This path is actually default on linux
   SET(CMAKE_INSTALL_PREFIX /usr/local)
-else()
-    message(STATUS "Installation path : " ${CMAKE_INSTALL_PREFIX})
 ENDIF()
+message(STATUS "Installation path : " ${CMAKE_INSTALL_PREFIX})
 
 IF (NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "DEBUG") 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc823e7ae184d088095120b422db110a1b85943e..0161f2a1ea40c426e0c809f948321b38a93c4139 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -395,7 +395,8 @@ INSTALL(FILES ${HDRS_WRAPPER}
 INSTALL(FILES ${HDRS_SOLVER}
     DESTINATION include/iri-algorithms/wolf/solver)
 
-INSTALL(FILES ../cmake_modules/Findwolf.cmake DESTINATION "lib/cmake/${PROJECT_NAME}")
+INSTALL(FILES "${CMAKE_SOURCE_DIR}/cmake_modules/Findwolf.cmake"
+    DESTINATION "lib/cmake/${PROJECT_NAME}")
 
 #install Find*.cmake
 configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/wolfConfig.cmake"