diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-10-23 04:07:07 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-10-23 04:07:07 +0000 |
| commit | a63d92e86e386815a61d3074fa0feb7c2fd298c6 (patch) | |
| tree | ffba29457330f210477f90d5b05a61a3e326082c /usr.bin/rcs/Makefile | |
| parent | 45538afa139c3dd50b9f6851eb2e28419c04d973 (diff) | |
with recent diff3 support, rcsmerge now works;
Diffstat (limited to 'usr.bin/rcs/Makefile')
| -rw-r--r-- | usr.bin/rcs/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/rcs/Makefile b/usr.bin/rcs/Makefile index d1f2828400e..780e082ccab 100644 --- a/usr.bin/rcs/Makefile +++ b/usr.bin/rcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2005/10/22 17:41:13 joris Exp $ +# $OpenBSD: Makefile,v 1.21 2005/10/23 04:07:06 joris Exp $ .PATH: ${.CURDIR}/../cvs @@ -6,11 +6,12 @@ PROG= rcs MAN= ci.1 co.1 ident.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 \ - buf.c date.y diff.c log.c rcs.c rcsnum.c strtab.c util.c + buf.c date.y diff.c diff3.c log.c rcs.c rcsnum.c strtab.c util.c CPPFLAGS+=-I${.CURDIR}/../cvs -DRCSPROG LINKS= ${BINDIR}/rcs ${BINDIR}/ci ${BINDIR}/rcs ${BINDIR}/co \ - ${BINDIR}/rcs ${BINDIR}/rcsclean ${BINDIR}/rcs ${BINDIR}/rcsdiff + ${BINDIR}/rcs ${BINDIR}/rcsclean ${BINDIR}/rcs ${BINDIR}/rcsdiff \ + ${BINDIR}/rcs ${BINDIR}/rcsmerge #MLINKS= rcs.1 ci.1 rcs.1 co.1 rcs.1 rcsclean.1 rcs.1 rcsdiff.1 CFLAGS+= -Wall |