Update to 1.79 and install as vi/ex/view.

1 files changed, 15 insertions, 15 deletions

diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile
index 97fb2a43ef2..41054fd59d7 100644
--- a/usr.bin/vi/build/Makefile
+++ b/usr.bin/vi/build/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.6 1996/09/22 01:03:19 downsj Exp $
-#
-# From	@(#)Makefile.in	8.63 (Berkeley) 6/19/96
+#	$OpenBSD: Makefile,v 1.7 1997/07/27 22:27:53 downsj Exp $
+#	@(#)Makefile.in	8.75 (Berkeley) 10/23/96
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include
 
-LDADD+= -lcurses -ltermlib
-DPADD+=	${LIBCURSES} ${LIBTERMLIB}
-PROG=	nvi
+LDADD+=	-lcurses -ltermlib
+DPADD+= ${LIBCURSES} ${LIBTERMLIB}
+PROG=	vi
+
 SRCS=	cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
 	cut.c delete.c ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c \
 	ex_at.c ex_bang.c ex_cd.c ex_cmd.c ex_cscope.c ex_delete.c \
@@ -26,17 +26,17 @@ SRCS=	cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
 	v_zexit.c vi.c vs_line.c vs_msg.c vs_refresh.c vs_relative.c \
 	vs_smap.c vs_split.c
 
-LINKS=  ${BINDIR}/nvi ${BINDIR}/nex
-MLINKS= nvi.1 nex.1
+LINKS=	${BINDIR}/vi ${BINDIR}/ex
+LINKS+=	${BINDIR}/vi ${BINDIR}/view
+MLINK=	vi.1 ex.1
+MLINK+=	vi.1 view.1
 
-.PATH: ${.CURDIR}/../vi ${.CURDIR}/../ex ${.CURDIR}/../cl ${.CURDIR}/../common ${.CURDIR}/../docs/USD.doc/vi.man \
-#${.CURDIR}/../svi ${.CURDIR}/../sex 
+.PATH: ${.CURDIR}/../vi ${.CURDIR}/../ex ${.CURDIR}/../cl ${.CURDIR}/../common ${.CURDIR}/../docs/USD.doc/vi.man
 
 .include <bsd.prog.mk>
 .include "../../Makefile.inc"
 
-#cat=	dutch english german ru_SU.KOI8-R swedish
-#datadir=	${DESTDIR}/usr/share
-#afterinstall:
-#	install -d ${datadir}/vi/catalog
-#	(cd ${.CURDIR}/../catalog && install -m $(NONBINMODE) -c $(cat) $(datadir)/vi/catalog )
+CATALOGS=	dutch english french german ru_SU.KOI8-R spanish swedish
+afterinstall:
+	install -d ${DESTDIR}/usr/share/vi/catalog
+	(cd ${.CURDIR}/../catalog && install -m ${NONBINMODE} -c ${CATALOGS} ${DESTDIR}/usr/share/vi/catalog )