[PATCH 180/180] Look for $PREFIX/etc/X11/xorg.conf before /etc/X11/xorg.conf

[spitzak at gmail.com]

From: Bill Spitzak <spitzak at gmail.com>

Otherwise it is rather hard to test xwayland and still have a
working X11.

There are numerous other instances of %P in the code, in all cases
I think the paths need to be edited so that the prefix is looked
in first (or at all) before /etc is.
---
 hw/xfree86/common/xf86Config.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 3934ff0..c6574f5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -74,32 +74,32 @@
  */
 #ifndef ALL_CONFIGPATH
 #define ALL_CONFIGPATH	"%A," "%R," \
-			"/etc/X11/%R," "%P/etc/X11/%R," \
+			"%P/etc/X11/%R," "/etc/X11/%R," \
 			"%E," "%F," \
-			"/etc/X11/%F," "%P/etc/X11/%F," \
-			"/etc/X11/%X," "/etc/%X," \
+			"%P/etc/X11/%F," "/etc/X11/%F," \
 			"%P/etc/X11/%X.%H," \
 			"%P/etc/X11/%X," \
+			"/etc/X11/%X," "/etc/%X," \
 			"%P/lib/X11/%X.%H," \
 			"%P/lib/X11/%X"
 #endif
 #ifndef RESTRICTED_CONFIGPATH
-#define RESTRICTED_CONFIGPATH	"/etc/X11/%S," "%P/etc/X11/%S," \
-			"/etc/X11/%G," "%P/etc/X11/%G," \
-			"/etc/X11/%X," "/etc/%X," \
+#define RESTRICTED_CONFIGPATH	"%P/etc/X11/%S," "/etc/X11/%S," \
+			"%P/etc/X11/%G," "/etc/X11/%G," \
 			"%P/etc/X11/%X.%H," \
 			"%P/etc/X11/%X," \
+			"/etc/X11/%X," "/etc/%X," \
 			"%P/lib/X11/%X.%H," \
 			"%P/lib/X11/%X"
 #endif
 #ifndef ALL_CONFIGDIRPATH
 #define ALL_CONFIGDIRPATH	"%A," "%R," \
-				"/etc/X11/%R," "%C/X11/%R," \
-				"/etc/X11/%X," "%C/X11/%X"
+				"%C/X11/%R," "/etc/X11/%R," \
+				 "%C/X11/%X," "/etc/X11/%X"
 #endif
 #ifndef RESTRICTED_CONFIGDIRPATH
-#define RESTRICTED_CONFIGDIRPATH	"/etc/X11/%R," "%C/X11/%R," \
-					"/etc/X11/%X," "%C/X11/%X"
+#define RESTRICTED_CONFIGDIRPATH	"%C/X11/%R," "/etc/X11/%R," \
+					 "%C/X11/%X," "/etc/X11/%X"
 #endif
 #ifndef SYS_CONFIGDIRPATH
 #define SYS_CONFIGDIRPATH	"/usr/share/X11/%X," "%D/X11/%X"
-- 
1.7.9.5