--- sconstruct.orig 2015-01-27 05:41:08.000000000 -0500 +++ sconstruct 2015-01-29 17:58:50.000000000 -0500 @@ -101,7 +101,7 @@ SYS = SYSTEM # Mac OS X installation path. - INSTALL_PATH = sys.prefix + sep + 'local' + INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib' # All other operating systems. @@ -121,13 +121,12 @@ RELAX_PATH = INSTALL_PATH + sep + 'relax' # Installation path for binaries. -BIN_PATH = INSTALL_PATH + sep + 'bin' +BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin' # Symbolic link installation path. SYMLINK = BIN_PATH + sep + 'relax' - # The distribution files. ######################### @@ -572,7 +571,7 @@ 'relax_fit.c'] # Construct the python include path (for Python.h). - py_include_minpath = sys.prefix + path.sep + 'include' + py_include_minpath = '@PYTHON_INCL@' + path.sep + '..' py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` # Test if Python.h resides here. @@ -588,7 +587,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. --- relax.orig 2012-06-11 05:51:33.000000000 -0400 +++ relax 2012-06-16 17:03:52.000000000 -0400 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!@PYTHON_BIN@ # Import the relax module. import relax --- scons/install.py.orig 2015-01-27 05:39:55.000000000 -0500 +++ scons/install.py 2015-01-29 18:01:43.000000000 -0500 @@ -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")