From 4ef61d6bf8b9141a4c2ee90bb25efd2485a42cf3 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 14 Sep 2011 14:39:47 -0500
Subject: Fix #includes when xserver is in a non-standard prefix.

Jeremy Huddleston tried building this with xserver's --prefix set to
/opt/Xorg and found that these #includes only worked so far by
coincidence.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 src/client.h     |  4 ++--
 src/driver.c     | 16 ++++++++--------
 src/input.c      | 18 +++++++++---------
 src/input.h      |  2 +-
 src/xlibclient.c |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/client.h b/src/client.h
index 9a15ce9..c4f171e 100644
--- a/src/client.h
+++ b/src/client.h
@@ -29,8 +29,8 @@
  * Nathaniel Way <nathanielcw@hotmail.com>
  */
 
-#include <xorg/colormap.h>
-#include <xorg/misc.h>
+#include <colormap.h>
+#include <misc.h>
 #include "xf86Cursor.h"
 
 struct NestedClientPrivate;
diff --git a/src/driver.c b/src/driver.c
index d4a0b1f..92edeca 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -32,14 +32,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <xorg/xorg-server.h>
-#include <xorg/fb.h>
-#include <xorg/micmap.h>
-#include <xorg/mipointer.h>
-#include <xorg/shadow.h>
-#include <xorg/xf86.h>
-#include <xorg/xf86Module.h>
-#include <xorg/xf86str.h>
+#include <xorg-server.h>
+#include <fb.h>
+#include <micmap.h>
+#include <mipointer.h>
+#include <shadow.h>
+#include <xf86.h>
+#include <xf86Module.h>
+#include <xf86str.h>
 #include "xf86Xinput.h"
 
 #include "config.h"
diff --git a/src/input.c b/src/input.c
index fac3537..bd5e11e 100644
--- a/src/input.c
+++ b/src/input.c
@@ -36,15 +36,15 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <xorg/xorg-server.h>
-#include <xorg/fb.h>
-#include <xorg/micmap.h>
-#include <xorg/mipointer.h>
-#include <xorg/shadow.h>
-#include <xorg/xf86.h>
-#include <xorg/xf86Module.h>
-#include <xorg/xf86str.h>
-#include <xorg/xf86_OSproc.h>
+#include <xorg-server.h>
+#include <fb.h>
+#include <micmap.h>
+#include <mipointer.h>
+#include <shadow.h>
+#include <xf86.h>
+#include <xf86Module.h>
+#include <xf86str.h>
+#include <xf86_OSproc.h>
 
 #include "config.h"
 
diff --git a/src/input.h b/src/input.h
index b153b61..58002d6 100644
--- a/src/input.h
+++ b/src/input.h
@@ -29,7 +29,7 @@
  * Nathaniel Way <nathanielcw@hotmail.com>
  */
 
-#include <xorg/xf86.h>
+#include <xf86.h>
 #include "xf86Xinput.h"
 
 // Loads the nested input driver.
diff --git a/src/xlibclient.c b/src/xlibclient.c
index 2f356dc..4c494d4 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -38,7 +38,7 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
 
-#include <xorg/xf86.h>
+#include <xf86.h>
 
 #include "client.h"
 
-- 
cgit v1.2.3