Ticket #43829: relax.patch
File relax.patch, 2.4 KB (added by howarth.at.macports@…, 10 years ago) |
---|
-
sconstruct
old new 99 99 SYS = SYSTEM 100 100 101 101 # Mac OS X installation path. 102 INSTALL_PATH = sys.prefix + sep + 'local'102 INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib' 103 103 104 104 105 105 # All other operating systems. … … 119 119 RELAX_PATH = INSTALL_PATH + sep + 'relax' 120 120 121 121 # Installation path for binaries. 122 BIN_PATH = INSTALL_PATH+ sep + 'bin'122 BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin' 123 123 124 124 # Symbolic link installation path. 125 125 SYMLINK = BIN_PATH + sep + 'relax' 126 126 127 127 128 129 128 # The distribution files. 130 129 ######################### 131 130 … … 532 531 'relax_fit.c'] 533 532 534 533 # Construct the python include path (for Python.h). 535 py_include_minpath = sys.prefix + path.sep + 'include'534 py_include_minpath = '@PYTHON_INCL@' + path.sep + '..' 536 535 py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` 537 536 538 537 # Construct the python bin path. 539 py_bin_minpath = sys.prefix+ path.sep + 'bin'538 py_bin_minpath = '@PREFIX@'+ path.sep + 'bin' 540 539 py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` 541 540 542 541 # Relaxation curve fitting build environment. -
relax
old new 1 #! /usr/bin/env python1 #!@PYTHON_BIN@ 2 2 3 3 # Import the relax module. 4 4 import relax -
scons/install.py
old new 111 111 ############### 112 112 113 113 # Run relax to create the *.pyc files. 114 print("\nCreating the byte-compiled *.pyc files.")115 python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`116 cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)117 print(cmd)118 system(cmd)114 #print("\nCreating the byte-compiled *.pyc files.") 115 #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` 116 #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) 117 #print(cmd) 118 #system(cmd) 119 119 120 120 # Final printout. 121 121 print("\n\n\n")