]>
Commit | Line | Data |
---|---|---|
5a9262f0 | 1 | diff -Nru enlightenment-0.16.5/src/config.c enlightenment-0.16.5.new/src/config.c |
2 | --- enlightenment-0.16.5/src/config.c Sun Oct 1 06:58:42 2000 | |
3 | +++ enlightenment-0.16.5.new/src/config.c Sun Oct 1 07:03:53 2000 | |
4 | @@ -3268,7 +3268,7 @@ | |
89c5ec23 | 5 | } |
6 | Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef " | |
2cacdeba | 7 | #ifndef __EMX__ |
5a9262f0 | 8 | - "-include %s/config/definitions " "-I%s " "-I%s/config " |
78c33e30 | 9 | + "-include %s/definitions " "-I%s " "-I%s " |
5a9262f0 | 10 | "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s " |
11 | "-D ENLIGHTENMENT_BIN=%s " | |
89c5ec23 | 12 | #else |
5a9262f0 | 13 | @@ -3283,7 +3283,7 @@ |
14 | "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 " | |
2cacdeba | 15 | "%s %s/cached/cfg/%s.preparsed", |
16 | #ifndef __EMX__ | |
17 | - epp_path, ENLIGHTENMENT_ROOT, themepath, ENLIGHTENMENT_ROOT, | |
18 | + epp_path, CONFIGDATADIR, themepath, CONFIGDATADIR, | |
19 | ENLIGHTENMENT_VERSION, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_BIN, | |
20 | #else | |
5a9262f0 | 21 | epp_path, x11root, ENLIGHTENMENT_ROOT, themepath, x11root, |
22 | @@ -3600,7 +3600,7 @@ | |
89c5ec23 | 23 | |
2cacdeba | 24 | /* look in system config dir */ |
25 | #ifndef __EMX__ | |
26 | - Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file); | |
27 | + Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file); | |
28 | #else | |
5a9262f0 | 29 | Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT), |
30 | file); | |
31 | @@ -3670,7 +3670,7 @@ | |
2cacdeba | 32 | Esnprintf(s, sizeof(s), "%s/", UserEDir()); |
33 | Fnlib_add_dir(fd, s); | |
34 | #ifndef __EMX__ | |
35 | - Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT); | |
36 | + Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR); | |
37 | #else | |
38 | Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT)); | |
39 | #endif | |
5a9262f0 | 40 | @@ -3701,7 +3701,7 @@ |
41 | Alert(_ | |
42 | ("Enlightenment has just experienced some major problems in\n" | |
43 | "attempting to load the theme you specified or the default\n" | |
44 | - "configuration directory:\n" "%s/config/\n" | |
45 | + "configuration directory:\n" "%s/\n" | |
46 | "This will prevent Enlightenment from loading any " | |
47 | "configuration\n" "files at all.\n" | |
48 | "Since this couldn't be found Enlightenment is probably not\n" | |
49 | @@ -3721,7 +3721,7 @@ | |
50 | "maintainer.\n" | |
51 | "If you are the administrator of your own system please\n" | |
52 | "consult the documentation that came with Enlightenment for\n" | |
53 | - "additional information.\n"), ENLIGHTENMENT_ROOT); | |
54 | + "additional information.\n"), CONFIGDATADIR); | |
2cacdeba | 55 | EDBUG_RETURN(0); |
56 | } | |
57 | strcpy(themepath, theme); |