--- libmodman/CMakeLists.txt.orig	2010-06-13 17:07:48.000000000 +0200
+++ libmodman/CMakeLists.txt	2010-07-24 15:23:19.116197805 +0200
@@ -1,10 +1,10 @@
 ### Main library
-add_library(libmodman SHARED module.hpp module_manager.hpp module_manager.cpp)
+add_library(modman SHARED module.hpp module_manager.hpp module_manager.cpp)
 if(NOT WIN32)
-  target_link_libraries(libmodman dl)
+  target_link_libraries(modman dl)
 endif()
-set_target_properties(libmodman PROPERTIES PREFIX "" VERSION 0.0.0 SOVERSION 0)
-install(TARGETS libmodman DESTINATION ${LIB_INSTALL_PREFIX})
+set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 0.0.0 SOVERSION 0)
+install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR})
 
 ### Tests
 if (BUILD_TESTING)
--- libmodman/test/CMakeLists.txt.orig	2010-06-13 17:07:48.000000000 +0200
+++ libmodman/test/CMakeLists.txt	2010-07-24 15:23:36.336197668 +0200
@@ -11,15 +11,15 @@
   include_directories(../../)
   add_library(${MODTYPE}_${MODNAME} MODULE libmodman/test/${MODTYPE}_${MODNAME}.cpp)
   set_target_properties(${MODTYPE}_${MODNAME} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY modules/${MODTYPE})
-  target_link_libraries(${MODTYPE}_${MODNAME} libmodman)
+  target_link_libraries(${MODTYPE}_${MODNAME} modman)
 endfunction(mm_create_module)
 
 function(mm_create_program name EXTTYPE)
   add_executable(${name} main.cpp)
-  target_link_libraries(${name} libmodman)
+  target_link_libraries(${name} modman)
   set_property(TARGET ${name} PROPERTY COMPILE_DEFINITIONS EXTTYPE=${EXTTYPE}_extension)
   if(${ARGC} GREATER 2)
-    target_link_libraries(${name} ${ARGN};libmodman)
+    target_link_libraries(${name} ${ARGN};modman)
     set_property(TARGET ${name} PROPERTY COMPILE_DEFINITIONS EXTTYPE=${EXTTYPE}_extension;SYMB=1)
   endif()
 endfunction(mm_create_program)
@@ -51,7 +51,7 @@
   mm_create_program(symbollnk symbol z)
 endif()
 add_executable(builtin builtin.cpp libmodman/test/builtin_one.cpp)
-target_link_libraries(builtin libmodman)
+target_link_libraries(builtin modman)
 set_property(TARGET builtin PROPERTY COMPILE_DEFINITIONS EXTTYPE=builtin_extension;BUILTIN_MODULE="extension";MM_MODULE_BUILTIN=extension)
 
 # Tests