--- Makefile.orig	Sat May 29 09:35:43 1993
+++ Makefile	Fri Mar  9 10:17:33 2001
@@ -116,8 +116,8 @@
 #  library files are not in a standard place, then the following
 #  two lines should be uncommented, and set appropriately.
 #
-#X11INCDIR         = -I$(OPENWINHOME)/include
-#X11LIBDIR         = -L$(OPENWINHOME)/lib
+X11INCDIR         = -I${X11BASE}/include
+X11LIBDIR         = -L${X11BASE}/lib
 #-------------------------------------------------------------------------
 #  If you are compiling the XView version, then the following two lines
 #  should be uncommented.
@@ -130,14 +130,14 @@
 #  Default locations where calctool files will be installed.
 #  You might wish to alter these values.
 #
-BINDIR          = /usr/local/bin
-LIBDIR          = /usr/local/lib
-MANDIR          = /usr/man/man$(MANSECT)
-MANSECT         = l
+BINDIR          = ${PREFIX}/bin
+LIBDIR          = ${PREFIX}/lib/X11
+MANDIR          = ${PREFIX}/man/man$(MANSECT)
+MANSECT         = 1
 #
 #  Compilation flags and standard macro definitions.
 #
-CFLAGS		= -g $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \
+CFLAGS		+= $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \
 		     $(NOINDEX) $(RCNAME) $(SELTYPE) $(SHLIB) $(SIGRET) \
 		     $(SUN4_KEYBOARD) $(TTEXT) $(MGRPARAM) $(MGRINCDIR) \
 		     $(X11INCDIR) $(XVIEWINCDIR)
@@ -147,7 +147,7 @@
 BINARIES        = mgr_calctool ps_calctool sv_calctool \
 		  tty_calctool xcalctool xv_calctool
 
-CC		= cc
+#CC		= cc
 
 LIBSRCS         = graphics.c display.c functions.c get.c
 LIBOBJS         = graphics.o display.o functions.o get.o
@@ -233,8 +233,7 @@
 			ld -o libcalctool.so.1.1 -assert pure-text $?
 
 install:
-		install -c -m 644 $(LIBNAME) $(LIBDIR)
-		install -s -m 751 calctool $(BINDIR)
+		install -c -s -m 751 calctool $(BINDIR)
 		install -c -m 644 calctool.help $(LIBDIR)
 		install -c -m 644 calctool.ps $(LIBDIR)
 		install -c -m 644 calctool.1 $(MANDIR)/calctool.$(MANSECT)