[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.317 1.318

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv3246/Source

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
Fix default install prefix on Haiku

Since Haiku does not have /usr (and therefore /usr/local), this commit
changes the default install prefix to the equivalent directory of
/boot/common.

See issue #9607.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.317
retrieving revision 1.318
diff -C 2 -d -r1.317 -r1.318
*** cmLocalGenerator.cxx	28 Sep 2009 15:42:47 -0000	1.317
--- cmLocalGenerator.cxx	30 Sep 2009 12:31:53 -0000	1.318
***************
*** 37,40 ****
--- 37,44 ----
  #include <assert.h>
  
+ #if defined(__HAIKU__)
+ #include <StorageKit.h>
+ #endif
+ 
  cmLocalGenerator::cmLocalGenerator()
  {
***************
*** 358,361 ****
--- 362,378 ----
      prefix = prefix_win32.c_str();
      }
+ #elif defined(__HAIKU__)
+   if (!prefix)
+     {
+     BPath dir;
+     if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
+       {
+       prefix = dir.Path();
+       }
+     else
+       {
+       prefix = "/boot/common";
+       }
+     }
  #else
    if (!prefix)