]>
Commit | Line | Data |
---|---|---|
1 | diff -ur enlightenment-0.16.devel.2.orig/src/Makefile.in enlightenment-0.16.devel.2/src/Makefile.in | |
2 | --- enlightenment-0.16.devel.2.orig/src/Makefile.in Mon May 24 20:45:06 1999 | |
3 | +++ enlightenment-0.16.devel.2/src/Makefile.in Sun Jun 20 04:10:42 1999 | |
4 | @@ -102,7 +102,7 @@ | |
5 | ||
6 | INCLUDES = -I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. | |
7 | ||
8 | -DEFS = -DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" | |
9 | +DEFS = -DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DCONFIGDATADIR=\"$(configdatadir)\" | |
10 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
11 | CONFIG_HEADER = ../econfig.h | |
12 | CONFIG_CLEAN_FILES = | |
13 | diff -ur enlightenment-0.16.devel.2.orig/src/config.c enlightenment-0.16.devel.2/src/config.c | |
14 | --- enlightenment-0.16.devel.2.orig/src/config.c Mon May 24 20:33:15 1999 | |
15 | +++ enlightenment-0.16.devel.2/src/config.c Sun Jun 20 04:09:44 1999 | |
16 | @@ -2675,8 +2675,8 @@ | |
17 | "-P " | |
18 | "-nostdinc " | |
19 | "-undef " | |
20 | - "-include %s/config/definitions " | |
21 | - "-I%s/config " | |
22 | + "-include %s/definitions " | |
23 | + "-I%s " | |
24 | "-D ENLIGHTENMENT_VERSION=%s " | |
25 | "-D ENLIGHTENMENT_ROOT=%s " | |
26 | "-D ENLIGHTENMENT_BIN=%s " | |
27 | @@ -2690,7 +2690,7 @@ | |
28 | "-D USER_SHELL=%s " | |
29 | "-D ENLIGHTENMENT_VERSION_015=1 " | |
30 | "%s %s/.enlightenment/cached/cfg/%s.preparsed", | |
31 | - epp_path, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_ROOT, | |
32 | + epp_path, CONFIGDATADIR, CONFIGDATADIR, | |
33 | ENLIGHTENMENT_VERSION, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_BIN, | |
34 | themepath, | |
35 | root.w, root.h, root.w, root.h, root.depth, | |
36 | @@ -2969,7 +2969,7 @@ | |
37 | if (isfile(s)) | |
38 | EDBUG_RETURN(duplicate(s)); | |
39 | /* look in system config dir */ | |
40 | - Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file); | |
41 | + Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file); | |
42 | if (isfile(s)) | |
43 | EDBUG_RETURN(duplicate(s)); | |
44 | /* not found.... NULL */ | |
45 | @@ -2996,7 +2996,7 @@ | |
46 | if (isfile(s)) | |
47 | EDBUG_RETURN(duplicate(s)); | |
48 | /* look in system config dir */ | |
49 | - Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file); | |
50 | + Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file); | |
51 | if (isfile(s)) | |
52 | EDBUG_RETURN(duplicate(s)); | |
53 | /* not found.... NULL */ | |
54 | @@ -3017,7 +3017,7 @@ | |
55 | home = homedir(getuid()); | |
56 | Esnprintf(s, sizeof(s), "%s/.enlightenment/", home); | |
57 | Fnlib_add_dir(fd, s); | |
58 | - Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT); | |
59 | + Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR); | |
60 | Fnlib_add_dir(fd, s); | |
61 | /* save the current theme */ | |
62 | if ((themelocation) && (themelocation[0] != 0)) | |
63 | @@ -3048,7 +3048,7 @@ | |
64 | Alert("Enlightenment has just experienced some major problems in\n" | |
65 | "attempting to load the theme you specified or the default\n" | |
66 | "configuration directory:\n" | |
67 | - "%s/config/\n" | |
68 | + "%s/\n" | |
69 | "This will prevent Enlightenment from loading any configuration\n" | |
70 | "files at all.\n" | |
71 | "Since this couldn't be found Enlightenment is probably not\n" | |
72 | @@ -3067,7 +3067,7 @@ | |
73 | "Please contact your system administrator or package maintainer.\n" | |
74 | "If you are the administrator of your own system please\n" | |
75 | "consult the documentation that came with Enlightenment for\n" | |
76 | - "addional information.\n", ENLIGHTENMENT_ROOT); | |
77 | + "addional information.\n", CONFIGDATADIR); | |
78 | if (home) | |
79 | Efree(home); | |
80 | EDBUG_RETURN(0); |