]>
Commit | Line | Data |
---|---|---|
afe72923 AG |
1 | --- freecnc-20050409/src/vfs/vfs.cpp~ 2005-03-26 00:49:21.000000000 +0100 |
2 | +++ freecnc-20050409/src/vfs/vfs.cpp 2005-04-09 23:26:39.000000000 +0200 | |
3 | @@ -48,7 +48,11 @@ | |
4 | externals->loadArchive(tempstr.c_str()); | |
5 | #if defined _WIN32 | |
6 | #else | |
7 | - externals->loadArchive("/etc/freecnc/"); | |
8 | + char f[1024]; | |
9 | + sprintf(f, "%s/.freecnc/", getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME")); | |
10 | + externals->loadArchive(f); | |
11 | + externals->loadArchive("/etc/"); | |
12 | + externals->loadArchive("/usr/share/freecnc/"); | |
13 | #endif | |
14 | ||
15 | try { | |
16 | --- freecnc-20050409/src/freecnc.cpp~ 2005-03-26 00:49:18.000000000 +0100 | |
17 | +++ freecnc-20050409/src/freecnc.cpp 2005-04-09 23:35:21.000000000 +0200 | |
18 | @@ -67,7 +67,7 @@ | |
19 | } | |
20 | ||
21 | const string& binpath = determineBinaryLocation(argv[0]); | |
22 | - string lf(binpath); | |
23 | + string lf("/tmp"); | |
24 | lf += "/freecnc.log"; | |
25 | ||
26 | VFS_PreInit(binpath.c_str()); |