Merge commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec'

* commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec':
  Fix #97: rebind.so not found when installed
This commit is contained in:
Peter Åstrand (astrand) 2013-11-27 13:33:30 +01:00
commit 08d37e0deb
1 changed files with 4 additions and 1 deletions

View File

@ -201,7 +201,10 @@ class WebSocketProxy(websocket.WebSocketServer):
self.wrap_times = [0, 0, 0]
if self.wrap_cmd:
rebinder_path = ['./', os.path.dirname(sys.argv[0])]
wsdir = os.path.dirname(sys.argv[0])
rebinder_path = [os.path.join(wsdir, "..", "lib"),
os.path.join(wsdir, "..", "lib", "websockify"),
wsdir]
self.rebinder = None
for rdir in rebinder_path: