[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40816] trunk/blender/intern/ghost/ SConscript: dont define the ghost PREFIX for scons, since this means our portable downloadable binary would find the system blender files (if installed).

[Campbell Barton]

Revision: 40816
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40816
Author:   campbellbarton
Date:     2011-10-06 02:29:15 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
dont define the ghost PREFIX for scons, since this means our portable downloadable binary would find the system blender files (if installed).

this should stay disabled until scons supports system/portable installs as with cmake.

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2011-10-06 02:28:09 UTC (rev 40815)
+++ trunk/blender/intern/ghost/SConscript	2011-10-06 02:29:15 UTC (rev 40816)
@@ -34,7 +34,12 @@
             sources.remove('intern' + os.sep + f + 'SDL.cpp')
         except ValueError:
             pass
-    defs += ['PREFIX=\\"/usr/local/\\"']  # XXX, make an option
+    ## removing because scons does not support system installation
+    ## if this is used for blender.org builds it means our distrobution
+    ## will find any locally installed blender and double up its script path.
+    ## So until this is supported properly as with CMake,
+    ## just dont use the PREFIX.
+    # defs += ['PREFIX=\\"/usr/local/\\"']  # XXX, make an option
     defs += ['WITH_X11_XINPUT']  # XXX, make an option
 
 elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):