Enlightenment CVS committal
Author : sndev
Project : e_modules
Module : language
Dir : e_modules/language/src/module
Modified Files:
e_mod_lang.c
Log Message:
* FreeBSD wants this module also ;)
===================================================================
RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_mod_lang.c 12 Jun 2006 21:52:28 -0000 1.27
+++ e_mod_lang.c 14 Jun 2006 18:34:01 -0000 1.28
@@ -11,7 +11,11 @@
/******************************************************/
-#define DFLT_XKB_RULES_FILE "/etc/X11/xkb/rules/xfree86"
+#ifdef __FreeBSD__
+ #define DFLT_XKB_RULES_FILE "/usr/X11R6/lib/X11/xkb/rules/xfree86"
+#else
+ #define DFLT_XKB_RULES_FILE "/etc/X11/xkb/rules/xfree86"
+#endif // __FreeBSD__
#define DFLT_XKB_LAYOUT "us"
#define DFLT_XKB_MODEL "pc101"
@@ -206,7 +210,11 @@
result = exml_file_read(exml, "/etc/X11/xkb/rules/xfree86.xml");
if (!result || result == -1)
{
+#ifdef __FreeBSD__
+ result = exml_file_read(exml,
"/usr/X11R6/lib/X11/xkb/rules/xfree86.xml");
+#else
result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml");
+#endif // __FreeBSD__
if (!result || result == -1)
EXML_RETURN_ON_ERROR(exml);
}
@@ -294,7 +302,11 @@
result = exml_file_read(exml, "/etc/X11/xkb/rules/xfree86.xml");
if (!result || result == -1)
{
+#ifdef __FreeBSD__
+ result = exml_file_read(exml,
"/usr/X11R6/lib/X11/xkb/rules/xfree86.xml");
+#else
result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml");
+#endif // __FreeBSD__
if (!result || result == -1)
EXML_RETURN_ON_ERROR(exml);
}
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
