--- nova/Makefile.orig	Fri May 15 00:41:12 1992
+++ nova/Makefile	Fri Aug  4 00:09:39 2000
@@ -48,22 +48,22 @@
 # for HPUX
 SHELL	= /bin/sh
 
-MAKE = /bin/make
+#MAKE = /bin/make
 AR = ar
 RANLIB = ranlib
-CPLUSPLUS = g++
+CPLUSPLUS = ${CXX}
 
 CAD	= /projects/octtools/octtools/${MACHINE}
 OCTTOOLS= ${CAD}
 CADROOT	= $$OCTTOOLS
 UTILS	= ${OCTTOOLS}/utils
-XINCLOC = -I/usr/local/X11R4/include
-XLIBLOC = -L/usr/local/X11R4/lib
+XINCLOC = -I${X11BASE}/include
+XLIBLOC = -L${X11BASE}/lib
 
 LINTCREATEFLAG = -C
 LINTEXTRAS =
 DBGFLAG =
-OPTFLAG =
+#OPTFLAG =
 
 # an alternative if you want links in the installation locations
 # back to the source directories would be:
@@ -138,7 +138,7 @@
 		"VPATH=${VPATH}"
 
 INCLUDE	= ${XINCLOC}  -I${OCTTOOLS}/include
-CFLAGS	= ${OPTFLAG} ${DBGFLAG} ${INCLUDE} '-DCADROOT="$$OCTTOOLS"'
+CFLAGS	+= ${OPTFLAG} ${DBGFLAG} ${INCLUDE} '-DCADROOT="$$OCTTOOLS"'
 VERSION	= "-DCUR_DATE=\"`date | awk '{print $$2, $$3, $$6}'`\"" \
 	  "-DCUR_TIME=\"`date | awk '{print $$4}'`\""
 LINTFLAGS= ${INCLUDE} '-DCADROOT="${CADROOT}"' ${LINTEXTRAS}