--- Makefile.orig	1996-03-19 04:44:33 UTC
+++ Makefile
@@ -27,16 +27,16 @@
 # LIBDIR and SHAREDIR.  All others must already exist.
 
 SHELL = /bin/sh
-TMPDIR = /usr/tmp
+TMPDIR = /var/tmp
 RECDIR = /usr/preserve
 
-JOVEHOME = /usr/local
-SHAREDIR = $(JOVEHOME)/lib/jove
-LIBDIR = $(JOVEHOME)/lib/jove
+JOVEHOME = ${DESTDIR}${PREFIX}
+SHAREDIR = $(JOVEHOME)/share/jove
+LIBDIR = $(JOVEHOME)/libexec/jove
 BINDIR = $(JOVEHOME)/bin
 MANDIR = $(JOVEHOME)/man/man$(MANEXT)
 MANEXT = 1
-DFLTSHELL = /bin/csh
+DFLTSHELL = /bin/sh
 
 # The install commands of BSD and System V differ in unpleasant ways:
 # -c: copy (BSD); -c dir: destination directory (SysV)
@@ -50,12 +50,12 @@ DFLTSHELL = /bin/csh
 INSTALLFLAGS = # -g bin -o root
 
 # to install executable files
-XINSTALL=cp
-#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
+#XINSTALL=cp
+XINSTALL=${BSD_INSTALL_PROGRAM}
 
 # to install text files
-TINSTALL=cp
-#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
+#TINSTALL=cp
+TINSTALL=${BSD_INSTALL_DATA}
 
 # These should all just be right if the above ones are.
 # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
@@ -79,7 +79,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
 # compiler, adding -Xa -v will increase compiler checking.
 # On DEC OSF/1, -std1 -O
 
-OPTFLAGS = -O
+#OPTFLAGS = -O
 
 # For making dependencies under BSD systems
 DEPENDFLAG = -M
@@ -163,13 +163,13 @@ LDFLAGS =
 #
 # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
 
-SYSDEFS =
+SYSDEFS = -DBSDPOSIX
 
 # for SCO Xenix, set
 #	MEMFLAGS = -Mle
 #	CFLAGS = -LARGE -O -F 3000 -K -Mle  (say -Mle2 for an 80286)
 
-CFLAGS = $(OPTFLAGS) $(SYSDEFS)
+CFLAGS += $(OPTFLAGS) $(SYSDEFS)
 
 # For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
 # CC = /usr/bin/cc
@@ -213,7 +213,7 @@ NROFF = nroff
 TROFF = troff -Tpost
 TROFFPOST = | /usr/lib/lp/postscript/dpost - >troff.out.ps
 
-MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
+MANUALS = $(JOVEM) $(TEACHJOVEM) # $(XJOVEM) $(JOVETOOLM)
 
 C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
 	delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \