Ticket #38517: relax.patch

File relax.patch, 2.4 KB (added by howarth@…, 12 years ago)

revised relax.patch for relax 2.2.4

  • sconstruct

    old new  
    100100    SYS = SYSTEM
    101101
    102102    # Mac OS X installation path.
    103     INSTALL_PATH = sys.prefix + sep + 'local'
     103    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
    104104
    105105
    106106# All other operating systems.
     
    120120RELAX_PATH = INSTALL_PATH + sep + 'relax'
    121121
    122122# Installation path for binaries.
    123 BIN_PATH = INSTALL_PATH + sep + 'bin'
     123BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
    124124
    125125# Symbolic link installation path.
    126126SYMLINK = BIN_PATH + sep + 'relax'
    127127
    128128
    129 
    130129# The distribution files.
    131130#########################
    132131
     
    533532                 'relax_fit.c']
    534533
    535534        # Construct the python include path (for Python.h).
    536         py_include_minpath = sys.prefix + path.sep + 'include'
     535        py_include_minpath = '@PYTHON_INCL@' + path.sep + '..'
    537536        py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    538537
    539538        # Construct the python bin path.
    540         py_bin_minpath = sys.prefix + path.sep + 'bin'
     539        py_bin_minpath = '@PREFIX@'+ path.sep + 'bin'
    541540        py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    542541
    543542        # Get the numpy include path (for numpy/arrayobject.h).
  • relax

    old new  
    1 #! /usr/bin/env python
     1#!@PREFIX@/bin/python2.7
    22
    33# Import the relax module.
    44import relax
  • scons/install.py

    old new  
    111111    ###############
    112112
    113113    # 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)
    119119
    120120    # Final printout.
    121121    print("\n\n\n")