Module Name: xsrc
Committed By: mrg
Date: Tue Jun 16 00:25:39 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h xorg-config.h
Log Message:
fix paths with /usr/local in them
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/xorg-config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.9 xsrc/external/mit/xorg-server/include/dix-config.h:1.10
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.9 Fri Jun 12 01:53:51 2009
+++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Jun 16 00:25:39 2009
@@ -25,7 +25,7 @@
#endif
/* Miscellaneous server configuration files path */
-#define SERVER_MISC_CONFIG_PATH "/usr/local/lib/xorg"
+#define SERVER_MISC_CONFIG_PATH "/usr/X11R7/lib/xorg"
/* Support Composite Extension */
#define COMPOSITE 1
@@ -52,7 +52,7 @@
/* #undef GLX_DRI */
/* Path to DRI drivers */
-#define DRI_DRIVER_PATH "/usr/local/lib/dri"
+#define DRI_DRIVER_PATH "/usr/X11R7/lib/modules/dri"
/* Support XDM-AUTH*-1 */
#define HASXDMAUTH 1
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.5 xsrc/external/mit/xorg-server/include/xorg-config.h:1.6
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.5 Thu Jun 11 04:56:54 2009
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Jun 16 00:25:39 2009
@@ -38,13 +38,13 @@
#define __XCONFIGFILE__ "xorg.conf"
/* Path to loadable modules. */
-#define DEFAULT_MODULE_PATH "/usr/local/lib/xorg/modules"
+#define DEFAULT_MODULE_PATH "/usr/X11R7/lib/modules"
/* Path to installed libraries. */
-#define DEFAULT_LIBRARY_PATH "/usr/local/lib"
+#define DEFAULT_LIBRARY_PATH "/usr/X11R7/lib"
/* Path to server log file. */
-#define DEFAULT_LOGPREFIX "/usr/local/var/log/Xorg."
+#define DEFAULT_LOGPREFIX "/var/log/Xorg."
/* Building DRI-capable DDX. */
#define XF86DRI 1
