Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

This commit is contained in:
Kelson42 2014-05-13 16:19:28 +02:00
commit fa80bf8eb0

View File

@ -90,6 +90,7 @@ for line in otool_out.split('\n'):
print("match: %s" % match.groups()[0]) print("match: %s" % match.groups()[0])
if 'libstdc++' in line or 'libgcc' in line: if 'libstdc++' in line or 'libgcc' in line:
newpath = u'/usr/lib/lib%s%s.dylib' % (match.groups()[0], match.groups()[1]) newpath = u'/usr/lib/lib%s%s.dylib' % (match.groups()[0], match.groups()[1])
newpath = u'lib%s%s.dylib' % (match.groups()[0], match.groups()[1])
elif is_component: elif is_component:
# newpath = u'@executable_path/../Frameworks/lib%s.dylib' % match.groups()[0] # newpath = u'@executable_path/../Frameworks/lib%s.dylib' % match.groups()[0]
newpath = u'@executable_path/lib%s.dylib' % match.groups()[0] newpath = u'@executable_path/lib%s.dylib' % match.groups()[0]