Ticket #46777: relax.patch

sconstruct

@@ -101 +101 @@
     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 +121 @@
 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 +571 @@
                  '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 +587 @@
                     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

@@ -1 @@
-#! /usr/bin/env python
+#!@PYTHON_BIN@
 
 # Import the relax module.
 import relax

scons/install.py

@@ -111 +111 @@
     ###############
 
     # 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")