Look for configuration file in /etc and /etc/ldc too (absolute paths)

except on Windows. Also disabled the `$PREFIX/etc/ldc` case for Windows, since
the "/etc/ldc" part was #if'ed out anyway.
This commit is contained in:
Frits van Bommel
2009-06-09 12:19:52 +02:00
parent f8840f66c4
commit bf89205f7d

View File

@@ -64,18 +64,31 @@ bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const c
if (p.exists())
return true;
#if !_WIN32
// Does Windows need something similar to these?
// 4) try the install-prefix/etc/ldc
p = sys::Path(LDC_INSTALL_PREFIX);
#if !_WIN32
// Does Windows need something similar?
p.appendComponent("etc");
p.appendComponent("ldc");
#endif
p.appendComponent(filename);
if (p.exists())
return true;
// 5) try next to the executable
// 5) try /etc (absolute path)
p = sys::Path("/etc");
p.appendComponent(filename);
if (p.exists())
return true;
// 6) try /etc/ldc (absolute path)
p = sys::Path("/etc/ldc");
p.appendComponent(filename);
if (p.exists())
return true;
#endif
// 7) try next to the executable
#if _WIN32
p = ConfigGetExePath(p);
#else