$NetBSD$

--- ENVIRONMENT.orig	2002-11-01 07:10:11.000000000 -0700
+++ ENVIRONMENT
@@ -40,14 +40,14 @@ XPM_FLAG = -DUSE_XPM
 XPM_LIB = -lXpm
 
 # X11 libraries
-X11_LIB = -lX11 -lPW
+#X11_LIB = -lX11 -lPW
 # non-SGI platforms do not need PW
-#X11_LIB = -lX11
+X11_LIB = -lX11
 # below uses shared libraries
 #X11_LIB = -lX11_s -lPW
 
 # Motif libraries
-MOTIF_LIB = -lXm -lXt
+MOTIF_LIB =  -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lXm -lXt
 # below uses shared libraries
 #MOTIF_LIB = -lXm_s -lXt_s
 
@@ -58,7 +58,7 @@ MOTIF_LIB = -lXm -lXt
 #GL_LIB_DIR = $(X11_LIB_DIR) -I/usr/local/mesa/lib
 
 # GL libraries
-GL_LIB = -lglut -lGLU -lGL -lXmu -lX11 -lXext
+GL_LIB = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lglut -lGLU -lGL -lXmu -lXi -lX11 -lXext
 
 # set up ENDIAN_FLAG as required
 #   WRITE_ENDIAN_PAR if want endianess written to par file
