--- CMakeLists.txtbuild_install	2009-09-14 13:54:05.000000000 +0200
+++ CMakeLists.txt	2010-02-12 10:54:10.000000000 +0100
@@ -9,6 +9,8 @@
 INCLUDE_REGULAR_EXPRESSION("^([Nn]rrd|itk|vtk|vnl|vcl|vxl|v3p|f2c|netlib|ce|itpack|DICOM|meta|png|dbh|tif|jpeg|zlib|gdcm).*$")
 SOURCE_GROUP("XML Files" REGULAR_EXPRESSION "[.]xml$")
 
+SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+
 # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
 # warnings
 IF(WIN32)
@@ -322,7 +324,7 @@
     ENDIF("${sun64}" STREQUAL "")
   ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
 
-  SET(ITK_INSTALL_LIB_DIR "/lib/InsightToolkit${sun64}")
+  SET(ITK_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}/InsightToolkit${sun64}")
 ENDIF(NOT ITK_INSTALL_LIB_DIR)
 
 IF(NOT ITK_INSTALL_DATA_DIR)
--- Utilities/openjpeg/CMakeLists.txtbuild_install	2008-05-20 10:39:29.000000000 +0200
+++ Utilities/openjpeg/CMakeLists.txt	2010-02-12 10:52:35.000000000 +0100
@@ -42,6 +42,8 @@
 # Create the library
 ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS})
 
+TARGET_LINK_LIBRARIES(${OPJ_PREFIX}openjpeg m)
+
 # Install library
 IF(ITK_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(${OPJ_PREFIX}openjpeg PROPERTIES ${ITK_LIBRARY_PROPERTIES})
--- Utilities/NrrdIO/CMakeLists.txtbuild_install	2008-05-09 02:11:10.000000000 +0200
+++ Utilities/NrrdIO/CMakeLists.txt	2010-02-12 10:52:35.000000000 +0100
@@ -57,7 +57,7 @@
 ADD_DEFINITIONS(-DTEEM_ZLIB=1)
 
 ADD_LIBRARY(ITKNrrdIO ${nrrdio_SRCS} )
-TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITK_ZLIB_LIBRARIES} )
+TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITK_ZLIB_LIBRARIES} m)
 
 IF(ITK_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(ITKNrrdIO PROPERTIES ${ITK_LIBRARY_PROPERTIES})