diff -uNr relax-4.0.2.orig/relax relax-4.0.2/relax --- relax-4.0.2.orig/relax 2016-05-13 10:07:30.000000000 -0400 +++ relax-4.0.2/relax 2016-05-21 15:59:33.000000000 -0400 @@ -1,4 +1,8 @@ -#! /usr/bin/env python +#!@PREFIX@/bin/python@TYPE_RAW@ + +import sys + +sys.path[0:0]=["@PREFIX@/lib/wxpython300-py@TYPE_PKG@"] # Import the relax module. import relax diff -uNr relax-4.0.2.orig/scons/install.py relax-4.0.2/scons/install.py --- relax-4.0.2.orig/scons/install.py 2016-05-13 10:07:35.000000000 -0400 +++ relax-4.0.2/scons/install.py 2016-05-21 15:59:12.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' + repr(sys.version_info[0]) + '.' + repr(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' + repr(sys.version_info[0]) + '.' + repr(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-4.0.2.orig/sconstruct relax-4.0.2/sconstruct --- relax-4.0.2.orig/sconstruct 2016-05-13 10:07:30.000000000 -0400 +++ relax-4.0.2/sconstruct 2016-05-21 15:59:12.000000000 -0400 @@ -101,7 +101,7 @@ SYS = SYSTEM # Mac OS X installation path. - INSTALL_PATH = sys.prefix + sep + 'local' + INSTALL_PATH = '@INSTALL_DIR@' + sep + 'lib' # All other operating systems. @@ -118,10 +118,10 @@ ############### # Relax installation directory. -RELAX_PATH = INSTALL_PATH + sep + 'relax' +RELAX_PATH = INSTALL_PATH + sep + 'relax-py@TYPE_PKG@' # Installation path for binaries. -BIN_PATH = INSTALL_PATH + sep + 'bin' +BIN_PATH = '@INSTALL_DIR@' + sep + 'bin' # Symbolic link installation path. SYMLINK = BIN_PATH + sep + 'relax' @@ -581,7 +581,7 @@ 'relax_fit.c'] # Construct the python include path (for Python.h). - py_include_minpath = sys.prefix + path.sep + 'include' + py_include_minpath = '@PREFIX@' + path.sep + 'include' py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` # Test if Python.h resides here. @@ -597,7 +597,7 @@ py_include_fullpath = environ['PYTHON_INCLUDE_DIR'] # Construct the python bin path. - py_bin_minpath = sys.prefix + path.sep + 'bin' + py_bin_minpath = '@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.