Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / configs / sunos5-v9

diff --git a/configs/sunos5-v9 b/configs/sunos5-v9
index 68a746cb877bff684abc9995428d66591c37f98f..ea2ab23e223bf1344223b6c6a69c5aef5656eb20 100644 (file)
--- a/configs/sunos5-v9
+++ b/configs/sunos5-v9
@@ -1,12 +1,12 @@
-# Configuration for SunOS 5
+# Configuration for SunOS 5, SPARC V9
 
 include $(TOP)/configs/default
 
 CONFIG_NAME = sunos5-v9
 
-MKLIB_OPTIONS = -archopt SUNV9 -cplusplus
+MKLIB_OPTIONS = -cplusplus
 
-LIB_DIR = $(TOP)/lib64
+LIB_DIR = lib64
 
 # Compiler and flags
 CC = cc
@@ -16,8 +16,8 @@ CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREAD
 GLUT_CFLAGS = -DSOLARIS_2_4_BUG
 
 GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm