enlightenment-config-path.patch

   1 diff -Nru enlightenment-0.16.4.orig/src/Makefile.in enlightenment-0.16.4/src/Makefile.in
   2 --- enlightenment-0.16.4.orig/src/Makefile.in   Tue Apr 11 01:23:14 2000
   3 +++ enlightenment-0.16.4/src/Makefile.in        Wed Jun  7 01:11:41 2000
   4 @@ -127,7 +127,7 @@
   5
   6  INCLUDES = -I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I../intl -I$(top_srcdir)/intl
   7
   8 -DEFS = -DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\"
   9 +DEFS = -DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\" -DCONFIGDATADIR=\"$(configdatadir)\"
  10  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  11  CONFIG_HEADER = ../econfig.h
  12  CONFIG_CLEAN_FILES =
  13 diff -Nru enlightenment-0.16.4.orig/src/config.c enlightenment-0.16.4/src/config.c
  14 --- enlightenment-0.16.4.orig/src/config.c      Mon Apr 10 21:47:22 2000
  15 +++ enlightenment-0.16.4/src/config.c   Wed Jun  7 01:13:37 2000
  16 @@ -3210,9 +3210,9 @@
  17           }
  18         Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-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 " "-D ENLIGHTENMENT_BIN=%s "
  27  #else
  28 @@ -3236,7 +3236,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 @@ -3563,7 +3563,7 @@
  38
  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",
  45              __XOS2RedirRoot(ENLIGHTENMENT_ROOT), file);
  46 @@ -3608,7 +3608,7 @@
  47
  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",
  54              __XOS2RedirRoot(ENLIGHTENMENT_ROOT), file);
  55 @@ -3633,7 +3633,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 @@ -3664,7 +3664,7 @@
  65       {
  66         Alert(_("Enlightenment has just experienced some major problems in\n"
  67                 "attempting to load the theme you specified or the default\n"
  68 -               "configuration directory:\n" "%s/config/\n"
  69 +               "configuration directory:\n" "%s/\n"
  70                 "This will prevent Enlightenment from loading any "
  71                 "configuration\n" "files at all.\n"
  72                 "Since this couldn't be found Enlightenment is probably not\n"
  73 @@ -3684,7 +3684,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);