Changeset 273

Show
Ignore:
Timestamp:
Mon Apr 10 22:42:46 2006
Author:
williamcaban
Message:

Fixed for accuracy detecting the path of the libpython####.so.###.##. This is temporary fix since eventually it is going to be migrated to disutils.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/source/linux/Make.py

    r128 r273  
    30 30 import string  
    31 31 import marshal  
    32   import parsesetup  
    33 32 import bkfile  
    34 33 import makemakefile  
    …… 
    53 52     if ( sys.platform[:5] == 'linux' or  
    54 53          sys.platform[:3] == 'win' or  
    55            sys.platform[:7] == 'freebsd' or  
    56            sys.platform[:7] == 'darwin' or  
      54          sys.platform[:7] in ['freebsd','darwin'] or  
    57 55          sys.platform[:6] == 'cygwin' ):  
    58 56         non_elf = 0                         # settable with -n option  
    …… 
    84 82     if not prefix:  
    85 83         prefix = sysconfig.PREFIX  
      84  
    86 85     # determine whether -p points to the Python source tree  
    87 86     ishome = os.path.exists(os.path.join(prefix, 'Python', 'ceval.c'))  
      87  
    88 88     cygwin = sys.platform == 'cygwin'  
    89 89     darwin = sys.platform[:7] == 'darwin'  
    …… 
    96 96         makefile_in = os.path.join(exec_prefix, 'Modules', 'Makefile')  
    97 97     else:  
    98           binlib = os.path.join (sysconfig.get_python_lib(True, True, exec_prefix), 'config')  
      98 #       binlib = os.path.join (sysconfig.get_python_lib(True, True, exec_prefix), 'config')  
      99         binlib = sysconfig.get_config_vars('LIBDIR')[0]  
    99 100         # TODO: Is it possible to have more than one path returned? if so fix "includes" list  
    100 101         incldir_list =  sysconfig.get_config_vars('INCLUDEDIR')  
    …… 
    161 162         cflags.append('-DNONELF')  
    162 163  
    163       libs = [os.path.join(binlib, sysconfig.get_config_vars('INSTSONAME')[0])]  
      164 #    libs = [os.path.join(binlib, sysconfig.get_config_vars('INSTSONAME')[0])]  
      165     libs = [os.path.join(sysconfig.get_config_vars('LIBDIR')[0], sysconfig.get_config_vars('INSTSONAME')[0])]  
      166  
    164 167  
    165 168     somevars = {}