[Cmake-commits] [cmake-commits] king committed cmCPackGenerator.cxx 1.19 1.20

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackGenerator.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: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmCPackGenerator.cxx	28 Sep 2009 15:42:50 -0000	1.19
--- cmCPackGenerator.cxx	30 Sep 2009 12:31:52 -0000	1.20
***************
*** 26,29 ****
--- 26,33 ----
  #include <memory> // auto_ptr
  
+ #if defined(__HAIKU__)
+ #include <StorageKit.h>
+ #endif
+ 
  //----------------------------------------------------------------------
  cmCPackGenerator::cmCPackGenerator()
***************
*** 1021,1024 ****
--- 1025,1038 ----
    this->InstallPath += "-";
    this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION");
+ #elif defined(__HAIKU__)
+   BPath dir;
+   if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
+     {
+     this->InstallPath = dir.Path();
+     }
+   else
+     {
+     this->InstallPath = "/boot/common";
+     }
  #else
    this->InstallPath = "/usr/local/";