From b7ed475b413f0b4eec66d70fb83afe1b4cc5101e Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 7 Dec 2015 19:38:26 +0100
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/src/init.cpp        |  1 -
 code/ryzom/client/src/login_patch.cpp | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 6739136fb..7882eee21 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -720,7 +720,6 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress)
 #ifdef NL_OS_MAC
 	defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources");
 #elif defined(NL_OS_UNIX)
-	defaultDirectory = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX));
 	if (!getRyzomSharePrefix().empty()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix());
 #endif
 
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 6dd7195e2..906e2a367 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -62,6 +62,7 @@
 
 #include "login_patch.h"
 #include "login.h"
+#include "user_agent.h"
 
 
 #ifndef RY_BG_DOWNLOADER
@@ -218,8 +219,15 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
 
 #ifdef NL_OS_MAC
 	ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data");
-#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX)
-	ReadableClientDataPath = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX) + "/data");
+#elif defined(NL_OS_UNIX)
+	if (!getRyzomSharePrefix().empty())
+	{
+		ReadableClientDataPath = CPath::standardizePath(getRyzomSharePrefix() + "/data");
+	}
+	else
+	{
+		ReadableClientDataPath = WritableClientDataPath;
+	}
 #else
 	ReadableClientDataPath = WritableClientDataPath;
 #endif