--- Makefile.options.orig	Tue Oct 20 22:19:08 1998
+++ Makefile.options	Tue Nov 28 06:56:07 2006
@@ -3,22 +3,22 @@
 #
 
 # C compiler
-CC = gcc
+CC ?= gcc
 
 # C++ compiler
-CCC = g++
+CCC = $(CXX)
 
 # C++ compiler running only the pre-processing stage
-CPP=g++ -E
+CPP = $(CXX) -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 = $(CXXFLAGS)
 
 # 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) ${CFLAGS}
 
 # 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.
+LFLAGS = ${LDFLAGS} -L$(LIBDIR) -L.