--- Makefile.orig	Tue Jan 11 15:24:45 2000
+++ Makefile	Tue Mar  7 13:02:43 2000
@@ -19,7 +19,7 @@
 # 1210 West Dayton Street, Madison, WI 53706, USA or to the Free
 # Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# $Header: /home/m/projects/spim/public_html/cvsroot/spimsal/Makefile,v 1.6 2000/01/11 23:24:45 brg Exp $
+# $Header: /share/b/spim/cvsroot/spimsal/Makefile,v 1.6 2000/01/11 23:24:45 brg Exp $
 
 
 #
@@ -56,9 +56,9 @@
 # 
 #TRAP_PATH = \"`pwd`/trap.handler\"
 #TRAP_PATH = \"/u/scottk/cs354/spim/trap.handler\"
-#TRAP_PATH = \"/usr/local/lib/spim/trap.handler\"
+TRAP_PATH = \"/usr/local/lib/spim/trap.handler\"
 #TRAP_PATH = \"//u/cs61c/lib/spim/trap.handler\"
-TRAP_PATH = \"/home/ff/cs61c/lib/spim/trap.handler\"
+#TRAP_PATH = \"/home/ff/cs61c/lib/spim/trap.handler\"
 
 # You don't need lex or flex if you have not wish to modify scanner.l.
 # If you have flex, use it instead of lex.  If you use flex, define this
@@ -76,7 +76,7 @@
 
 
 # Location of X11 root directory.
-TOPDIR = /usr/sww/X11R6
+TOPDIR = /usr/X11R6
 
 
 # Size of the segments when spim starts up (data segment must be >= 64K).
@@ -102,7 +102,7 @@
 # pnb - no need to put full path here, especially for win32
 CC = gcc
 
-IFLAGS = -I/usr/sww/X11R6/include
+IFLAGS = -I/usr/X11R6/include
 CFLAGS = -gstabs+ $(IFLAGS) $(ENDIAN) $(MEM_SIZES) $(SYS_FLAGS)
 YFLAGS = -d
 YCFLAGS =
@@ -110,7 +110,7 @@
 # brg- add -R$(TOPDIR)/lib, on solaris.
 # It may also be necessary to add -lsocket -lnsl to link against certain
 # versions of X11.
-XLDFLAGS = -L$(TOPDIR)/lib -R$(TOPDIR)/lib -lXaw -lXmu -lXt -lXext -lX11 #-lsocket -lnsl
+XLDFLAGS = -L$(TOPDIR)/lib -lXaw -lXmu -lXt -lXext -lX11 #-lsocket -lnsl
 
 
 # lex.yy.c is usually compiled with -O to speed it up.