summaryrefslogtreecommitdiff
path: root/src/servermain.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/servermain.cpp')
-rw-r--r--src/servermain.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/servermain.cpp b/src/servermain.cpp
index 5eb5162ae..9be0c80ae 100644
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -284,11 +284,14 @@ int main(int argc, char *argv[])
core::array<std::string> filenames;
filenames.push_back(porting::path_user +
DIR_DELIM + "minetest.conf");
+ // Legacy configuration file location
+ filenames.push_back(porting::path_user +
+ DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
#ifdef RUN_IN_PLACE
// Try also from a lower level (to aid having the same configuration
// for many RUN_IN_PLACE installs)
filenames.push_back(porting::path_user +
- DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
+ DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
#endif
for(u32 i=0; i<filenames.size(); i++)