--- CMakeLists.txt.orig	2011-01-12 13:26:53.000000000 +0000
+++ CMakeLists.txt	2011-01-12 13:25:56.000000000 +0000
@@ -71,14 +71,14 @@
 # Installation sub-directories
 #-----------------------------------------------------------------------------
 
-SET(INSTALL_BINDIR "/bin")
+SET(INSTALL_BINDIR "/bin/dcmtk")
 SET(INSTALL_INCDIR "/include")
 SET(INSTALL_LIBDIR "/lib")
 SET(INSTALL_ETCDIR "/etc/dcmtk")
 SET(INSTALL_DATDIR "/share/dcmtk")
 SET(INSTALL_DOCDIR "/share/doc/dcmtk")
 SET(INSTALL_HTMDIR "/share/doc/dcmtk/html")
-SET(INSTALL_MANDIR "/share/man")
+SET(INSTALL_MANDIR "/man")
 
 #-----------------------------------------------------------------------------
 # Platform-independent settings
@@ -234,6 +234,13 @@
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 #-----------------------------------------------------------------------------
+# Module to build shared and static libraries
+#-----------------------------------------------------------------------------
+
+INCLUDE(CMake/BuildLibrary.cmake)
+
+
+#-----------------------------------------------------------------------------
 # Third party libraries
 #-----------------------------------------------------------------------------