--- xc/extras/Mesa/configs/linux-dri.orig	2005-08-01 11:06:38 +0400
+++ xc/extras/Mesa/configs/linux-dri	2005-08-04 22:56:12 +0400
@@ -9,7 +9,7 @@
 CC = gcc
 CXX = g++
 
-MKDEP = /usr/X11R6/bin/makedepend
+MKDEP = $(TOP)/../../config/makedepend/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 
@@ -24,7 +24,7 @@
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+X11_INCLUDES = -I$(TOP)/../../exports/include -I$(TOP)/../../exports/include/X11 -I$(TOP)/../../exports/include/X11/extensions
 
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(ASM_FLAGS) -std=c99 -ffast-math 
@@ -34,8 +34,10 @@
 
 ASM_SOURCES = 
 
+DRM_SOURCE_PATH = $(TOP)/../drm
+
 # Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
+EXTRA_LIB_PATH=-L$(TOP)/../../exports/lib
 
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
@@ -49,5 +51,4 @@
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+DRI_DIRS = dri_client r200 r300 radeon savage