--- Makefile.orig	Wed Oct 16 12:23:06 2002
+++ Makefile	Wed Oct 16 12:26:59 2002
@@ -510,16 +510,16 @@
 #	LIBDIR= /usr/lib
 #
 #BINDIR= /usr/local/bin
-BINDIR= /usr/bin
+BINDIR= ${PREFIX}/bin
 
 #SHAREDIR= /usr/local/lib
-SHAREDIR= /usr/share
+SHAREDIR= ${PREFIX}/share
 
 #INCDIR= /usr/local/include
-INCDIR= /usr/include
+INCDIR= ${PREFIX}/include
 
 #LIBDIR= /usr/local/lib
-LIBDIR= /usr/lib
+LIBDIR= ${PREFIX}/lib
 
 # By default, these values are based on the above 4 values
 # --------------------------------------------------------
@@ -576,7 +576,7 @@
 #MANDIR=
 #MANDIR= /usr/local/man/man1
 #MANDIR= /usr/man/man1
-MANDIR= /usr/share/man/man1
+MANDIR= ${PREFIX}/man/man1
 #MANDIR= /usr/man/u_man/man1
 #MANDIR= /usr/contrib/man/man1
 
@@ -669,8 +669,8 @@
 #
 # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
 #
-USE_READLINE=
-#USE_READLINE= -DUSE_READLINE
+#USE_READLINE=
+USE_READLINE= -DUSE_READLINE
 #
 #READLINE_LIB=
 READLINE_LIB= -lreadline -lhistory -lncurses
@@ -765,6 +765,7 @@
 #
 MAKE_FILE= Makefile
 #MAKE_FILE=
+MANDIR=	${PREFIX}/man/man1
 
 # If you do not wish to use purify, leave PURIFY commented out.
 #
@@ -849,13 +850,13 @@
 CCOPT= ${DEBUG} ${NO_SHARED}
 CCMISC=
 #
-CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
-ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
+CFLAGS+= -DCALC_SRC
+ICFLAGS= ${CFLAGS}
 #
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
 #
-LCC= gcc
+LCC= cc
 CC= ${PURIFY} ${LCC}
 #
 ###