[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30396] trunk/blender/intern/ghost: Rather then hard coded /usr/share, use CMAKE_INSTALL_PREFIX to set the PREFIX, could be added for scons/ make too.

[Campbell Barton]

Revision: 30396
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30396
Author:   campbellbarton
Date:     2010-07-15 22:25:09 +0200 (Thu, 15 Jul 2010)

Log Message:
-----------
Rather then hard coded /usr/share, use CMAKE_INSTALL_PREFIX to set the PREFIX, could be added for scons/make too.

Modified Paths:
--------------
    trunk/blender/intern/ghost/CMakeLists.txt
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt	2010-07-15 20:16:17 UTC (rev 30395)
+++ trunk/blender/intern/ghost/CMakeLists.txt	2010-07-15 20:25:09 UTC (rev 30396)
@@ -85,6 +85,9 @@
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
 	)
+
+	ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
+
 ENDIF(APPLE)
 
 BLENDERLIB(bf_ghost "${SRC}" "${INC}")

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2010-07-15 20:16:17 UTC (rev 30395)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2010-07-15 20:25:09 UTC (rev 30396)
@@ -67,6 +67,10 @@
 #include <stdio.h> // for fprintf only
 #include <cstdlib> // for exit
 
+#ifndef PREFIX
+#  define PREFIX "/usr/local"
+#endif
+
 typedef struct NDOFPlatformInfo {
 	Display *display;
 	Window window;
@@ -1461,7 +1465,7 @@
 
 const GHOST_TUns8* GHOST_SystemX11::getSystemDir() const
 {
-	return (GHOST_TUns8*)"/usr/share";
+	return (GHOST_TUns8*) PREFIX "/share";
 }
 
 const GHOST_TUns8* GHOST_SystemX11::getUserDir() const