===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- src/usr.bin/rcs/Makefile	2006/04/27 07:59:33	1.34
+++ src/usr.bin/rcs/Makefile	2006/05/15 06:58:03	1.35
@@ -1,18 +1,18 @@
-#	$OpenBSD: Makefile,v 1.34 2006/04/27 07:59:33 xsa Exp $
+#	$OpenBSD: Makefile,v 1.35 2006/05/15 06:58:03 xsa Exp $
 
 .PATH: ${.CURDIR}/..
 
 PROG=	rcs
-MAN=	ci.1 co.1 ident.1 rcs.1 rcsclean.1 rcsdiff.1 rcsmerge.1 rlog.1
+MAN=	ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 rcsdiff.1 rcsmerge.1 rlog.1
 
-SRCS=	ci.c co.c ident.c rcsclean.c rcsdiff.c rcsmerge.c rcsprog.c rlog.c \
-	rcsutil.c buf.c date.y diff.c diff3.c rcs.c rcsnum.c \
+SRCS=	ci.c co.c ident.c merge.c rcsclean.c rcsdiff.c rcsmerge.c rcsprog.c \
+	rlog.c rcsutil.c buf.c date.y diff.c diff3.c rcs.c rcsnum.c \
 	rcstime.c worklist.c xmalloc.c
 
 LINKS=	${BINDIR}/rcs ${BINDIR}/ci ${BINDIR}/rcs ${BINDIR}/co \
+	${BINDIR}/rcs ${BINDIR}/ident ${BINDIR}/rcs ${BINDIR}/merge
 	${BINDIR}/rcs ${BINDIR}/rcsclean ${BINDIR}/rcs ${BINDIR}/rcsdiff \
 	${BINDIR}/rcs ${BINDIR}/rcsmerge ${BINDIR}/rcs ${BINDIR}/rlog \
-	${BINDIR}/rcs ${BINDIR}/ident
 
 CPPFLAGS+=-I${.CURDIR}
 CFLAGS+=-Wall