[packages/e16.git] / enlightenment-config-path.patch

diff -Nru enlightenment-0.16.6/src/config.c enlightenment-0.16.6.new/src/config.c
--- enlightenment-0.16.6/src/config.c	Wed Nov  5 18:58:50 2003
+++ enlightenment-0.16.6.new/src/config.c	Tue Nov 11 07:03:53 2003
@@ -3263,7 +3263,7 @@
 	  }
 	Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
 #ifndef __EMX__
-		  "-include %s/config/definitions " "-I%s " "-I%s/config "
+		  "-include %s/definitions " "-I%s " "-I%s "
 		  "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s "
 		  "-D ENLIGHTENMENT_BIN=%s "
 #else
@@ -3278,7 +3278,7 @@
 		  "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 "
 		  "%s %s/cached/cfg/%s.preparsed",
 #ifndef __EMX__
-		  epp_path, ENLIGHTENMENT_ROOT, themepath, ENLIGHTENMENT_ROOT,
+		  epp_path, CONFIGDATADIR, themepath, CONFIGDATADIR,
 		  ENLIGHTENMENT_VERSION, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_BIN,
 #else
 		  epp_path, x11root, ENLIGHTENMENT_ROOT, themepath, x11root,
@@ -3534,7 +3534,7 @@
 
    /* look in system config dir */
 #ifndef __EMX__
-   Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
+   Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
 #else
    Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
 	     file);
@@ -3579,7 +3579,7 @@
 
    /* look in system config dir */
 #ifndef __EMX__
-   Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
+   Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
 #else
    Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
 	     file);
@@ -3669,7 +3669,7 @@
    Fnlib_add_dir(pFnlibData, s);
 #endif
 #ifndef __EMX__
-   Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT);
+   Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR);
 #else
    Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
 #endif
@@ -3701,7 +3701,7 @@
 	Alert(_
 	      ("Enlightenment has just experienced some major problems in\n"
 	       "attempting to load the theme you specified or the default\n"
-	       "configuration directory:\n" "%s/config/\n"
+	       "configuration directory:\n" "%s/\n"
 	       "This will prevent Enlightenment from loading any "
 	       "configuration\n" "files at all.\n"
 	       "Since this couldn't be found Enlightenment is probably not\n"
@@ -3721,7 +3721,7 @@
 	       "maintainer.\n"
 	       "If you are the administrator of your own system please\n"
 	       "consult the documentation that came with Enlightenment for\n"
-	       "additional information.\n"), ENLIGHTENMENT_ROOT);
+	       "additional information.\n"), CONFIGDATADIR);
 	EDBUG_RETURN(0);
      }
    strcpy(themepath, theme);
Commit	Line	Data
2a85befe	1	diff -Nru enlightenment-0.16.6/src/config.c enlightenment-0.16.6.new/src/config.c
	2	--- enlightenment-0.16.6/src/config.c Wed Nov 5 18:58:50 2003
	3	+++ enlightenment-0.16.6.new/src/config.c Tue Nov 11 07:03:53 2003
	4	@@ -3263,7 +3263,7 @@
89c5ec23	5	}
89c5ec23	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 "
5a9262f0	11	"-D ENLIGHTENMENT_BIN=%s "
89c5ec23	12	#else
2a85befe	13	@@ -3278,7 +3278,7 @@
5a9262f0	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,
2a85befe	22	@@ -3534,7 +3534,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),
5a9262f0	30	file);
2a85befe	31	@@ -3579,7 +3579,7 @@
	32
	33	/* look in system config dir */
	34	#ifndef __EMX__
	35	- Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
	36	+ Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
	37	#else
	38	Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
	39	file);
	40	@@ -3669,7 +3669,7 @@
	41	Fnlib_add_dir(pFnlibData, s);
	42	#endif
2cacdeba	43	#ifndef __EMX__
	44	- Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT);
	45	+ Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR);
	46	#else
	47	Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
	48	#endif
5a9262f0	49	@@ -3701,7 +3701,7 @@
	50	Alert(_
	51	("Enlightenment has just experienced some major problems in\n"
	52	"attempting to load the theme you specified or the default\n"
	53	- "configuration directory:\n" "%s/config/\n"
	54	+ "configuration directory:\n" "%s/\n"
	55	"This will prevent Enlightenment from loading any "
	56	"configuration\n" "files at all.\n"
	57	"Since this couldn't be found Enlightenment is probably not\n"
	58	@@ -3721,7 +3721,7 @@
	59	"maintainer.\n"
	60	"If you are the administrator of your own system please\n"
	61	"consult the documentation that came with Enlightenment for\n"
	62	- "additional information.\n"), ENLIGHTENMENT_ROOT);
	63	+ "additional information.\n"), CONFIGDATADIR);
2cacdeba	64	EDBUG_RETURN(0);
	65	}
	66	strcpy(themepath, theme);