enlightenment-config-path.patch

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