 -LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
 -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
 +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-+  /boot/home/config/non-packaged
-+  /boot/home/config
 +  /boot/common/non-packaged
 +  /boot/common
 +  /boot/system
 +  )
 +LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  /boot/home/config/non-packaged/lib
-+  /boot/home/config/lib
 +  /boot/common/non-packaged/lib
 +  /boot/common/lib
 +  /boot/system/develop/lib/x86

 SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
 SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+  SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
 
-INCLUDE(Platform/UnixPaths)
-LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)

diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake
--- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake	2011-07-08 12:21:44.016777216 +0000
+++ cmake-2.8.5/Modules/Platform/Haiku.cmake	2011-07-09 17:59:50.092798976 +0000
@@ -1,20 +1,27 @@
-SET(BEOS 1)
+SET(HAIKU 1)
+SET(UNIX 1)
