diff -uNr relax-3.0.0/relax relax-3.0.0.fink/relax --- relax-3.0.0/relax 2013-08-06 09:37:50.000000000 -0400 +++ relax-3.0.0.fink/relax 2013-08-15 10:37:35.000000000 -0400 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2.X # Import the relax module. import relax diff -uNr relax-3.0.0/scons/install.py relax-3.0.0.fink/scons/install.py --- relax-3.0.0/scons/install.py 2013-08-06 09:35:04.000000000 -0400 +++ relax-3.0.0.fink/scons/install.py 2013-08-15 10:37:35.000000000 -0400 @@ -111,11 +111,11 @@ ############### # Run relax to create the *.pyc files. - print("\nCreating the byte-compiled *.pyc files.") - python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` - cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) - print(cmd) - system(cmd) + #print("\nCreating the byte-compiled *.pyc files.") + #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` + #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) + #print(cmd) + #system(cmd) # Final printout. print("\n\n\n") diff -uNr relax-3.0.0/sconstruct relax-3.0.0.fink/sconstruct --- relax-3.0.0/sconstruct 2013-08-06 09:37:50.000000000 -0400 +++ relax-3.0.0.fink/sconstruct 2013-08-15 10:37:35.000000000 -0400 @@ -99,7 +99,7 @@ SYS = SYSTEM # Mac OS X installation path. - INSTALL_PATH = sys.prefix + sep + 'local' + INSTALL_PATH = 'FINK_INSTALL_DIR' + sep + 'lib' # All other operating systems. @@ -116,10 +116,10 @@ ############### # Relax installation directory. -RELAX_PATH = INSTALL_PATH + sep + 'relax' +RELAX_PATH = INSTALL_PATH + sep + 'relax-py2X' # Installation path for binaries. -BIN_PATH = INSTALL_PATH + sep + 'bin' +BIN_PATH = 'FINK_INSTALL_DIR' + sep + 'bin' # Symbolic link installation path. SYMLINK = BIN_PATH + sep + 'relax' @@ -532,11 +532,11 @@ 'relax_fit.c'] # Construct the python include path (for Python.h). - py_include_minpath = sys.prefix + path.sep + 'include' + py_include_minpath = 'FINK_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_minpath = 'FINK_PREFIX' + path.sep + 'bin' py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` # Relaxation curve fitting build environment.