--- test/server/general/Makefile.orig	Tue Jan  2 09:22:00 2001
+++ test/server/general/Makefile	Fri May 16 16:54:46 2003
@@ -23,7 +23,7 @@
 
 INCLUDES	= -I../../../lib/include
 
-CFLAGS		= -O2 -DDEBUG -g -Wall
+CFLAGS		+= -Wall -DDEBUG
 ALL_CFLAGS	= $(DEFINES) $(INCLUDES) $(CFLAGS)
 
 
@@ -42,7 +42,7 @@
 else
 CURSES		= ncurses
 endif
-LIBS		= $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
+LIBS		= $(CURRENT_GSI_LIBS) -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
 
 
 #-----------------------------------------------------------------------------#