--- Makefile.mix.orig	Tue Oct 22 00:10:44 1996
+++ Makefile.mix	Tue Oct 22 00:23:07 1996
@@ -120,28 +120,29 @@
 
 #---- These settings are recommended for BSD 4.3 UNIX and SunOS ----
 #---- For BSD386, add "-DTERMIOS" to CFLAGS
-#OBJ=	.o
-#EXE=	
-#COM=	
-#EXTRA=	unix$(OBJ)
-#EXTRA2=
-#LIBS=	-ltermcap
-#BIN=	/usr/local/bin
-#CC=	cc
-#CFLAGS=	-Dbsd -O
-#SMALL=
-#LARGE=
-#OF=	-o ""
-#RF=	-c
-#PROGS=	elvis$(EXE) ctags$(COM) ref$(COM) elvrec$(COM) elvprsv$(COM)
-#CHMEM=
-#SORT=	-DSORT
-#RM=	rm -f
-#CP=	cp
-#LN=	ln
-#SYS=	unx
-#DUMMY=
-#CFG=
+OBJ=	.o
+EXE=	
+COM=	
+EXTRA=	unix$(OBJ)
+EXTRA2=
+PREFIX?=/usr/local
+LIBS=	-ltermcap -L${PREFIX}/lib -lcanna
+BIN=	${PREFIX}/bin
+CC=	cc
+CFLAGS+=	-Dbsd -O -I${PREFIX}/include -D_HAVE_PARAM_H -DNO_EXITCODE -DHAVE_OFF_T -D__386BSD__
+SMALL=
+LARGE=
+OF=	-o ""
+RF=	-c
+PROGS=	elvis$(EXE) ctags$(COM) ref$(COM) elvrec$(COM) elvprsv$(COM)
+CHMEM=
+SORT=	-DSORT
+RM=	rm -f
+CP=	cp
+LN=	ln -sf
+SYS=	unx
+DUMMY=
+CFG=
 
 #---- These settings are recommended for Coherent 4.0 ----
 #OBJ=.o
@@ -536,7 +537,7 @@
 OBJS2=	ex$(OBJ) input$(OBJ) main$(OBJ) misc$(OBJ) modify$(OBJ) move1$(OBJ)
 OBJS3=	move2$(OBJ) move3$(OBJ) move4$(OBJ) move5$(OBJ) opts$(OBJ) recycle$(OBJ)
 OBJS4=	redraw$(OBJ) regexp$(OBJ) regsub$(OBJ) system$(OBJ) tio$(OBJ) tmp$(OBJ)
-OBJS5=	vars$(OBJ) vcmd$(OBJ) vi$(OBJ) kanji$(OBJ) fepseq$(OBJ) # canna$(OBJ)
+OBJS5=	vars$(OBJ) vcmd$(OBJ) vi$(OBJ) kanji$(OBJ) fepseq$(OBJ) canna$(OBJ)
 OBJS=	$(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
 
 ALIAS=	alias$(OBJ)
@@ -677,6 +678,7 @@
 
 inst.unx: $(DUMMY)
 	$(CP) $(PROGS) $(BIN)
+	(cd $(BIN); strip $(PROGS))
 	(cd $(BIN); chmod 755 $(PROGS))
 	(cd $(BIN); chown bin $(PROGS))
 	(cd $(BIN); chown root elvprsv$(COM) elvrec$(COM))
@@ -685,12 +687,9 @@
 	-$(LN) $(BIN)/elvis $(BIN)/ex
 	-$(LN) $(BIN)/elvis $(BIN)/view
 	-$(LN) $(BIN)/elvis $(BIN)/input
-	test -d /usr/preserve || (mkdir /usr/preserve; chmod 755 /usr/preserve)
+	test -d /var/preserve || (mkdir /var/preserve; chmod 755 /var/preserve)
 	@if test -d /etc/rc2.d; then \
 		echo $(BIN)/elvprsv /tmp/elv* >/etc/rc2.d/S03elvis; \
-	else \
-		echo "::: YOU STILL NEED TO EDIT THE /ETC/RC FILE, OR WHATEVER,"; \
-		echo "::: TO HAVE TEMP FILES BE PRESERVED AFTER A SYSTEM CRASH."; \
 	fi
 	sh instman.sh $(PROGS)