Index: build/get-py-info.py =================================================================== --- build/get-py-info.py (revision 15943) +++ build/get-py-info.py (working copy) @@ -43,9 +43,8 @@ sys.exit(0) def ldshared_process(just_libs = None): - libdir = sysconfig.get_config_var('LIBDIR') + libdir = sysconfig.get_config_var('LIBPL') ldshared = sysconfig.get_config_var('LDSHARED') - ldlibrary = sysconfig.get_config_var('LDLIBRARY') libpyfwdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR') ldshared_elems = string.split(ldshared, " ") libs_elems = [] @@ -60,33 +59,19 @@ libs_elems.append(ldshared_elems[i]) elif ldshared_elems[i][:2] == '-l': libs_elems.append(ldshared_elems[i]) - ldlibpath = os.path.join(libdir, ldlibrary) if libpyfwdir and libpyfwdir != "no-framework": libpyfw = sysconfig.get_config_var('PYTHONFRAMEWORK') py_lopt = "-framework " + libpyfw libs_elems.append(py_lopt) ldshared_elems.append(py_lopt) - elif (os.path.exists(ldlibpath)): + else: if libdir != '/usr/lib': py_Lopt = "-L" + libdir libs_elems.append(py_Lopt) ldshared_elems.append(py_Lopt) - ldlibname, ldlibext = os.path.splitext(ldlibrary) - if ldlibname[:3] == 'lib' and ldlibext == '.so': - py_lopt = '-l' + ldlibname[3:] - else: - py_lopt = ldlibrary + py_lopt = '-lpython%s' % sysconfig.get_config_var('VERSION') libs_elems.append(py_lopt) ldshared_elems.append(py_lopt) - else: - python_version = sys.version[:3] - py_Lopt = "-L" + os.path.join(sys.prefix, "lib", "python" + - python_version, "config") - py_lopt = "-lpython" + python_version - libs_elems.append(py_Lopt) - libs_elems.append(py_lopt) - ldshared_elems.append(py_Lopt) - ldshared_elems.append(py_lopt) if just_libs: return string.join(libs_elems, " ") else: