Merge with develop

--HG--
branch : compatibility-develop

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
 

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