pyrox.dev
1--- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200
2+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200
3@@ -110,17 +110,11 @@
4 if dlname is None:
5 return None
6
7- # Darwin uses absolute paths where possible; since the libtool files never
8- # contain absolute paths, use the libdir field
9- if platform.system() == 'Darwin':
10- dlbasename = os.path.basename(dlname)
11- libdir = _extract_libdir_field(la_file)
12- if libdir is None:
13- return dlbasename
14- return libdir + '/' + dlbasename
15- # From the comments in extract_libtool(), older libtools had
16- # a path rather than the raw dlname
17- return os.path.basename(dlname)
18+ dlbasename = os.path.basename(dlname)
19+ libdir = _extract_libdir_field(la_file)
20+ if libdir is None:
21+ return dlbasename
22+ return libdir + '/' + dlbasename
23
24
25 def extract_libtool(la_file):