Ticket #43829: relax.patch

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

replacement relax.patch for relax 3.2.1 update

  • sconstruct

    old new  
    9999    SYS = SYSTEM
    100100
    101101    # Mac OS X installation path.
    102     INSTALL_PATH = sys.prefix + sep + 'local'
     102    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
    103103
    104104
    105105# All other operating systems.
     
    119119RELAX_PATH = INSTALL_PATH + sep + 'relax'
    120120
    121121# Installation path for binaries.
    122 BIN_PATH = INSTALL_PATH + sep + 'bin'
     122BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
    123123
    124124# Symbolic link installation path.
    125125SYMLINK = BIN_PATH + sep + 'relax'
    126126
    127127
    128 
    129128# The distribution files.
    130129#########################
    131130
     
    532531                 'relax_fit.c']
    533532
    534533        # 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 + '..'
    536535        py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    537536
    538537        # Construct the python bin path.
    539         py_bin_minpath = sys.prefix + path.sep + 'bin'
     538        py_bin_minpath = '@PREFIX@'+ path.sep + 'bin'
    540539        py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    541540
    542541        # 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' + `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")