Fixed cvs to work with/without object directories and added missing rcslean

directory to top level makefile.

10 files changed, 10 insertions, 10 deletions

diff --git a/gnu/usr.bin/rcs/Makefile b/gnu/usr.bin/rcs/Makefile
index 2181815..4a9fd08 100644
--- a/gnu/usr.bin/rcs/Makefile
+++ b/gnu/usr.bin/rcs/Makefile
@@ -1,3 +1,3 @@
-SUBDIR= lib ci co ident merge rcs rcsdiff rcsmerge rlog rcsfreeze
+SUBDIR= lib ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/rcs/ci/Makefile b/gnu/usr.bin/rcs/ci/Makefile
index 9b64e08..f93376a 100644
--- a/gnu/usr.bin/rcs/ci/Makefile
+++ b/gnu/usr.bin/rcs/ci/Makefile
@@ -1,7 +1,7 @@
 PROG= ci
 
 SRCS=	ci.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/co/Makefile b/gnu/usr.bin/rcs/co/Makefile
index e9de8da..23eb948 100644
--- a/gnu/usr.bin/rcs/co/Makefile
+++ b/gnu/usr.bin/rcs/co/Makefile
@@ -1,7 +1,7 @@
 PROG= co
 
 SRCS=	co.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/ident/Makefile b/gnu/usr.bin/rcs/ident/Makefile
index 1a618e5..77850a2 100644
--- a/gnu/usr.bin/rcs/ident/Makefile
+++ b/gnu/usr.bin/rcs/ident/Makefile
@@ -1,7 +1,7 @@
 PROG= ident
 
 SRCS=	ident.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/merge/Makefile b/gnu/usr.bin/rcs/merge/Makefile
index d14afb2..edb2c20 100644
--- a/gnu/usr.bin/rcs/merge/Makefile
+++ b/gnu/usr.bin/rcs/merge/Makefile
@@ -1,7 +1,7 @@
 PROG= merge
 
 SRCS=	merge.c
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile
index d62c8d1..b96e0b2 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile
+++ b/gnu/usr.bin/rcs/rcs/Makefile
@@ -1,7 +1,7 @@
 PROG= rcs
 
 SRCS=	rcs.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 MAN1=	rcs.0 rcsintro.0
diff --git a/gnu/usr.bin/rcs/rcsclean/Makefile b/gnu/usr.bin/rcs/rcsclean/Makefile
index fc0c626..fa9ca81 100644
--- a/gnu/usr.bin/rcs/rcsclean/Makefile
+++ b/gnu/usr.bin/rcs/rcsclean/Makefile
@@ -1,7 +1,7 @@
 PROG= rcsclean
 
 SRCS=	rcsclean.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile b/gnu/usr.bin/rcs/rcsdiff/Makefile
index 837c241..f1baa6f 100644
--- a/gnu/usr.bin/rcs/rcsdiff/Makefile
+++ b/gnu/usr.bin/rcs/rcsdiff/Makefile
@@ -1,7 +1,7 @@
 PROG= rcsdiff
 
 SRCS=	rcsdiff.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile
index 0c1f643..0c6f177 100644
--- a/gnu/usr.bin/rcs/rcsmerge/Makefile
+++ b/gnu/usr.bin/rcs/rcsmerge/Makefile
@@ -1,7 +1,7 @@
 PROG= rcsmerge
 
 SRCS=	rcsmerge.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rlog/Makefile b/gnu/usr.bin/rcs/rlog/Makefile
index b6a1268..3d1fc2c 100644
--- a/gnu/usr.bin/rcs/rlog/Makefile
+++ b/gnu/usr.bin/rcs/rlog/Makefile
@@ -1,7 +1,7 @@
 PROG= rlog
 
 SRCS=	rlog.c 
-LDADD=	-L${.CURDIR}/../lib/obj -lrcs
+LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>