From 883f9891cb203dd087843b830ab058d6c9e160dc Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 13 Jul 2006 02:50:27 +0000
Subject: LIB_DIR is now just 'lib' or 'lib64' Replaced $(LIB_DIR) with
 $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configs/default | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'configs/default')

diff --git a/configs/default b/configs/default
index ec44c8af2b..3eaa74aa07 100644
--- a/configs/default
+++ b/configs/default
@@ -59,7 +59,7 @@ GLW_SOURCES = GLwDrawA.c
 
 
 # Directories to build
-LIB_DIR = $(TOP)/lib
+LIB_DIR = lib
 SRC_DIRS = mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
@@ -70,14 +70,18 @@ PROGRAM_DIRS = demos redbook samples xdemos
 # Library/program dependencies
 EXTRA_LIB_PATH ?=
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 
 
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
 DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+
+# Where libGL will look for DRI hardware drivers
+DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
+
-- 
cgit v1.2.3