From 0061969cf249c1957c0b8e7114d763fbd1cdb3dd Mon Sep 17 00:00:00 2001
From: Adam Potolsky <adam@synergy-project.org>
Date: Tue, 2 Jun 2015 14:28:20 -0700
Subject: [PATCH] Updating installed dir for Linux and MacOS #4696

---
 src/gui/src/Plugin.cpp             | 5 +++--
 src/lib/arch/unix/ArchFileUnix.cpp | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gui/src/Plugin.cpp b/src/gui/src/Plugin.cpp
index e2555399..ebdc70ce 100644
--- a/src/gui/src/Plugin.cpp
+++ b/src/gui/src/Plugin.cpp
@@ -35,11 +35,12 @@ static const char kInstallerPluginLocation[] = "Plugins";
 #elif defined(Q_OS_MAC)
 static const char kMacPluginPrefix[] = "lib";
 static const char kMacPluginExt[] = ".dylib";
-static const char kInstallerPluginLocation[] = "plugins";
+static const char kInstallerPluginLocation[] = "plugins"; // TODO: Fix for mac
 #else
 static const char kLinuxPluginPrefix[] = "lib";
 static const char kLinuxPluginExt[] = ".so";
-static const char kInstallerPluginLocation[] = "plugins";
+// /usr/bin becomes /usr/bin/../lib/syn...
+static const char kInstallerPluginLocation[] = "../lib/synergy/plugins";
 #endif
 
 QString Plugin::getOsSpecificExt()
diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp
index e4f5afca..1e52ddd7 100644
--- a/src/lib/arch/unix/ArchFileUnix.cpp
+++ b/src/lib/arch/unix/ArchFileUnix.cpp
@@ -92,9 +92,9 @@ std::string
 ArchFileUnix::getInstalledDirectory()
 {
 #if WINAPI_XWINDOWS
-	return "/bin";
+	return "/usr/bin";
 #else
-	return "";
+	return "/Applications/Synergy.app/Contents/MacOS/Synergy";
 #endif
 }