Ticket #46777: relax.patch

File relax.patch, 2.5 KB (added by howarth.at.macports@…, 10 years ago)

Replacement relax.patch for 3.3.6

  • sconstruct

    old new  
    101101    SYS = SYSTEM
    102102
    103103    # Mac OS X installation path.
    104     INSTALL_PATH = sys.prefix + sep + 'local'
     104    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
    105105
    106106
    107107# All other operating systems.
     
    121121RELAX_PATH = INSTALL_PATH + sep + 'relax'
    122122
    123123# Installation path for binaries.
    124 BIN_PATH = INSTALL_PATH + sep + 'bin'
     124BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
    125125
    126126# Symbolic link installation path.
    127127SYMLINK = BIN_PATH + sep + 'relax'
    128128
    129129
    130 
    131130# The distribution files.
    132131#########################
    133132
     
    572571                 'relax_fit.c']
    573572
    574573        # Construct the python include path (for Python.h).
    575         py_include_minpath = sys.prefix + path.sep + 'include'
     574        py_include_minpath = '@PYTHON_INCL@' + path.sep + '..'
    576575        py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    577576
    578577        # Test if Python.h resides here.
     
    588587                    py_include_fullpath = environ['PYTHON_INCLUDE_DIR']
    589588
    590589        # Construct the python bin path.
    591         py_bin_minpath = sys.prefix + path.sep + 'bin'
     590        py_bin_minpath = '@PREFIX@' + path.sep + 'bin'
    592591        py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    593592
    594593        # Relaxation curve fitting build environment.
  • relax

    old new  
    1 #! /usr/bin/env python
     1#!@PYTHON_BIN@
    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' + repr(sys.version_info[0]) + '.' + repr(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' + repr(sys.version_info[0]) + '.' + repr(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")