--- Makefile.options.orig	Tue Oct 20 13:19:08 1998
+++ Makefile.options	Thu Jan 20 18:04:03 2000
@@ -12,13 +12,13 @@
 CPP=g++ -E
 
 # Grammar generator - e.g. bison,yacc
-YACC = bison
+YACC = yacc
 
 # Lexical scanner - e.g. flex,lex
 LEX = flex
 
 # Favourite flags for favourite compiler
-CCFLAGS = -g
+CCFLAGS = $(CFLAGS)
 
 # Please don't change the next three lines unless you know what you are doing..
 AROPTIONS = rc
@@ -26,7 +26,7 @@
 LIBDIR = ../lib
 
 # Add extra include dirs here
-IFLAGS = -I$(IDIR)
+IFLAGS = -I$(IDIR) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.2 -I$(LOCALBASE)/include/tk8.2
 
 # Add extra directories where you want the abacus to search for libraries here
 LFLAGS = -L/usr/local/lib -L/usr/X11R6/lib -L$(LIBDIR) -L.