projects / packages / e16.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cacdeba | 1 | diff -Nur enlightenment-0.16.2.orig/src/Makefile.in enlightenment-0.16.2/src/Makefile.in |
| 2 | --- enlightenment-0.16.2.orig/src/Makefile.in Sun Nov 7 02:23:57 1999 | |
| 3 | +++ enlightenment-0.16.2/src/Makefile.in Fri Nov 12 17:17:05 1999 | |
| 4 | @@ -105,7 +105,7 @@ | |
| 16fa29d4 JR |
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 = | |
| 2cacdeba | 13 | diff -Nur enlightenment-0.16.2.orig/src/config.c enlightenment-0.16.2/src/config.c |
| 14 | --- enlightenment-0.16.2.orig/src/config.c Tue Oct 26 10:53:30 1999 | |
| 15 | +++ enlightenment-0.16.2/src/config.c Fri Nov 12 17:17:34 1999 | |
| 16 | @@ -3206,9 +3206,9 @@ | |
| 17 | "-nostdinc " | |
| 18 | "-undef " | |
| 19 | #ifndef __EMX__ | |
| 20 | - "-include %s/config/definitions " | |
| 21 | + "-include %s/definitions " | |
| 22 | + "-I%s " | |
| 23 | "-I%s " | |
| 24 | - "-I%s/config " | |
| 25 | "-D ENLIGHTENMENT_VERSION=%s " | |
| 26 | "-D ENLIGHTENMENT_ROOT=%s " | |
| 27 | "-D ENLIGHTENMENT_BIN=%s " | |
| 28 | @@ -3232,7 +3232,7 @@ | |
| 29 | "-D ENLIGHTENMENT_VERSION_015=1 " | |
| 30 | "%s %s/cached/cfg/%s.preparsed", | |
| 31 | #ifndef __EMX__ | |
| 32 | - epp_path, ENLIGHTENMENT_ROOT, themepath, ENLIGHTENMENT_ROOT, | |
| 33 | + epp_path, CONFIGDATADIR, themepath, CONFIGDATADIR, | |
| 34 | ENLIGHTENMENT_VERSION, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_BIN, | |
| 35 | #else | |
| 36 | epp_path, x11root, ENLIGHTENMENT_ROOT, | |
| 37 | @@ -3558,7 +3558,7 @@ | |
| 38 | EDBUG_RETURN(duplicate(s)); | |
| 39 | /* look in system config dir */ | |
| 40 | #ifndef __EMX__ | |
| 41 | - Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file); | |
| 42 | + Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file); | |
| 43 | #else | |
| 44 | Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT), file); | |
| 45 | #endif | |
| 46 | @@ -3597,7 +3597,7 @@ | |
| 47 | EDBUG_RETURN(duplicate(s)); | |
| 48 | /* look in system config dir */ | |
| 49 | #ifndef __EMX__ | |
| 50 | - Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file); | |
| 51 | + Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file); | |
| 52 | #else | |
| 53 | Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT), file); | |
| 54 | #endif | |
| 55 | @@ -3620,7 +3620,7 @@ | |
| 56 | Esnprintf(s, sizeof(s), "%s/", UserEDir()); | |
| 57 | Fnlib_add_dir(fd, s); | |
| 58 | #ifndef __EMX__ | |
| 59 | - Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT); | |
| 60 | + Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR); | |
| 61 | #else | |
| 62 | Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT)); | |
| 63 | #endif | |
| 64 | @@ -3654,7 +3654,7 @@ | |
| 65 | Alert("Enlightenment has just experienced some major problems in\n" | |
| 66 | "attempting to load the theme you specified or the default\n" | |
| 67 | "configuration directory:\n" | |
| 68 | - "%s/config/\n" | |
| 69 | + "%s/\n" | |
| 70 | "This will prevent Enlightenment from loading any " | |
| 71 | "configuration\n" | |
| 72 | "files at all.\n" | |
| 73 | @@ -3675,7 +3675,7 @@ | |
| 74 | "maintainer.\n" | |
| 75 | "If you are the administrator of your own system please\n" | |
| 76 | "consult the documentation that came with Enlightenment for\n" | |
| 77 | - "additional information.\n", ENLIGHTENMENT_ROOT); | |
| 78 | + "additional information.\n", CONFIGDATADIR); | |
| 79 | EDBUG_RETURN(0); | |
| 80 | } | |
| 81 | strcpy(themepath, theme); |