From deada5306f659f10a1bf1d9f505e7133173725d9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 22 Jun 2017 17:26:01 +0530 Subject: [PATCH] ... --- src/calibre/devices/idevice/libimobiledevice.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py index 6ba22300fa..4209b83a2a 100644 --- a/src/calibre/devices/idevice/libimobiledevice.py +++ b/src/calibre/devices/idevice/libimobiledevice.py @@ -33,15 +33,11 @@ def load_library(): elif isosx: env = "OS X" # Load libiMobileDevice - path = 'libimobiledevice.6.dylib' - if hasattr(sys, 'frameworks_dir'): - path = os.path.join(sys.frameworks_dir, path) - lib = cdll.LoadLibrary(str(path)) + path = os.path.join(getattr(sys, 'frameworks_dir', '/sw/sw/lib'), 'libimobiledevice.6.dylib') + lib = cdll.LoadLibrary(path) # Load libplist - path = 'libplist.3.dylib' - if hasattr(sys, 'frameworks_dir'): - path = os.path.join(sys.frameworks_dir, path) - plist_lib = cdll.LoadLibrary(str(path)) + path = os.path.join(getattr(sys, 'frameworks_dir', '/sw/sw/lib'), 'libplist.3.dylib') + plist_lib = cdll.LoadLibrary(path) else: env = "linux" try: