Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 19:26:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename DATA_DIR macro to less polluting RS_DATA_DIR

Browse source
This commit is contained in:
Gioacchino Mazzurco 2021-12-09 12:55:06 +01:00
parent e55fa2b9d5
commit 94bd099407
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/rsserver/rsaccounts.cc
View file

@ -841,14 +841,15 @@ static bool checkAccount(const std::string &accountdir, AccountDetails &account,
/* Use RetroShare's exe dir */
dataDirectory = ".";
#elif defined(ANDROID)
#elif defined(__ANDROID__)
// TODO: This is probably not really used on Android
dataDirectory = PathBaseDirectory()+"/usr/share/retroshare";
#elif defined(DATA_DIR)
#elif defined(RS_DATA_DIR)
// cppcheck-suppress ConfigurationNotChecked
dataDirectory = DATA_DIR;
dataDirectory = RS_DATA_DIR;
// For all other OS the data directory must be set in libretroshare.pro
#else
# error "For your target OS automatic data dir discovery is not supported, cannot compile if DATA_DIR variable not set."
# error "For your target OS automatic data dir discovery is not supported, cannot compile if RS_DATA_DIR variable not set."
#endif
if (!check)