From 3eeafb7179b861ee6359c8747f4e009513d7ce7a Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun, 17 Aug 2008 19:12:54 +0100
Subject: choose sane default for dri driver location

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs/default')

diff --git a/configs/default b/configs/default
index 1b203b00d2..2d14b8aef7 100644
--- a/configs/default
+++ b/configs/default
@@ -91,7 +91,7 @@ APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+DRI_DRIVER_INSTALL_DIR = /usr/lib/dri
 
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-- 
cgit v1.2.3


From ccf1910dd4b2a8ccd04ddbdf725b6dd3f8026eee Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun, 17 Aug 2008 20:17:18 +0100
Subject: consolidate intel directories.

we now have

src/gallium/winsys/drm/intel/{common,dri,egl}
---
 configs/default | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configs/default')

diff --git a/configs/default b/configs/default
index 2d14b8aef7..cd2c39c365 100644
--- a/configs/default
+++ b/configs/default
@@ -73,7 +73,6 @@ EGL_DRIVERS_DIRS = demo
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
-GALLIUM_WINSYS_COMMON_DIRS =
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
-- 
cgit v1.2.3