merge

code/nel/CMakeLists.txt

@@ -58,8 +58,8 @@ ENDIF(WITH_GTK)
 IF(UNIX)
   SET(prefix ${CMAKE_INSTALL_PREFIX})
   SET(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
-  SET(libdir "${CMAKE_INSTALL_PREFIX}/lib")
-  SET(includedir "${CMAKE_INSTALL_PREFIX}/include")
+  SET(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+  SET(includedir ${CMAKE_INSTALL_PREFIX}/include)
   SET(enable_ligo ${WITH_LIGO})
   SET(enable_logic ${WITH_LOGIC})
   SET(enable_georges ${WITH_GEORGES})
@@ -67,7 +67,7 @@ IF(UNIX)
   SET(enable_3d ${WITH_3D})
   SET(enable_pacs ${WITH_PACS})
   SET(enable_sound ${WITH_SOUND})
-  CONFIGURE_FILE(nel-config.in nel-config)
+  CONFIGURE_FILE(nel-config.in ${CMAKE_CURRENT_BINARY_DIR}/nel-config)
 
   INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/nel-config DESTINATION bin)
 ENDIF(UNIX)