r10948 - /1.3/sconstruct -- February 26, 2010 - 16:36

Author: bugman
Date: Fri Feb 26 16:36:59 2010
New Revision: 10948

URL: http://svn.gna.org/viewcvs/relax?rev=10948&view=rev
Log:
Partially removed the need for Fink specific modifications.

This removes the need for the patch given by Jack Howarth <howarth att bromo 
dot med dot uc dot edu>
in the message https://mail.gna.org/public/relax-users/2010-02/msg00031.html.

A similar python specific path was being used to find Python.h on all 
architectures, so the include
path was copied and modified to be a bin path.


Modified:
    1.3/sconstruct

Modified: 1.3/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sconstruct?rev=10948&r1=10947&r2=10948&view=diff
==============================================================================
--- 1.3/sconstruct (original)
+++ 1.3/sconstruct Fri Feb 26 16:36:59 2010
@@ -478,6 +478,10 @@
         py_include_minpath = sys.prefix + path.sep + 'include'
         py_include_fullpath = py_include_minpath + path.sep + 'python' + 
`sys.version_info[0]` + '.' + `sys.version_info[1]`
 
+        # Construct the python bin path.
+        py_bin_minpath = sys.prefix + path.sep + 'bin'
+        py_bin_fullpath = py_bin_minpath + path.sep + 'python' + 
`sys.version_info[0]` + '.' + `sys.version_info[1]`
+
         # Get the numpy include path (for numpy/arrayobject.h).
         numpy_path = get_include()
 
@@ -500,7 +504,7 @@
 
         # Catch Mac OS X and send the correct command line options to the 
linker (these may become redundant as SCons improves).
         if env['PLATFORM'] == 'darwin':
-            env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix 
+ path.sep + 'bin' + path.sep + 'python', '-dynamic', '-undefined', 
'dynamic_lookup'])
+            env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', 
py_bin_fullpath, '-dynamic', '-undefined', 'dynamic_lookup'])
             env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
 
         # Shared library prefix and suffix.