From: Jerome Glisse <glisse@freedesktop.org>
Date: Mon, 2 Jan 2006 18:47:00 +0000 (+0000)
Subject: Use X11_INCLUDES config macro instead of
X-Git-Tag: android-x86-1.6~4072
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31be39742bb76e524f9b9cba8ea68d8a668aa9f6;p=android-x86%2Fexternal-mesa.git

Use X11_INCLUDES config macro instead of
hardcoded path in makefile.
---

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 3a85d3eb9b3..86920aba99d 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -79,7 +79,7 @@ OBJECTS = $(SOURCES:.c=.o)
 ##### RULES #####
 
 .c.o:
-	$(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $<
+	$(CC) -c -I$(TOP)/include $(X11_INCLUDES) $(CFLAGS) $(GLUT_CFLAGS) $<
 
 
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 3c66c6778fc..e21cbbd4054 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -7,7 +7,7 @@ MAJOR = 1
 MINOR = 0
 TINY = 0
 
-INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
+INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 $(X11_INCLUDES)
 
 
 OBJECTS = $(GLW_SOURCES:.c=.o)