--- vst2blif/Makefile.orig	Fri Jul 15 08:45:02 1994
+++ vst2blif/Makefile	Fri Aug  4 00:13:06 2000
@@ -15,22 +15,22 @@
 # for HPUX
 SHELL	= /bin/sh
 
-MAKE = /bin/make
+#MAKE = /bin/make
 AR = ar
 RANLIB = ranlib
-CPLUSPLUS = g++
+CPLUSPLUS = ${CXX}
 
 OCTTOOLS	= /projects/octtools/octtools/$(MACHINE)
 SIS	= /usr/eesww/sis
 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 =
 LDEXTRAS =
 DBGFLAG =
-OPTFLAG = -O
+#OPTFLAG = -O
 
 # an alternative if you want links in the installation locations
 # back to the source directories would be:
@@ -104,7 +104,7 @@
 		"VPATH=${VPATH}"
 
 INCLUDE	=
-CFLAGS	= ${OPTFLAG} ${DBGFLAG} ${INCLUDE} 
+CFLAGS	+= ${OPTFLAG} ${DBGFLAG} ${INCLUDE} 
 YFLAGS = -d
 VERSION	= "-DCUR_DATE=\"`date | awk '{print $$2, $$3, $$6}'`\"" \
 	  "-DCUR_TIME=\"`date | awk '{print $$4}'`\""