diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 3f53af54529c..37ea28c0ab8f 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -3,7 +3,11 @@ CFLAGS +=	-I${.CURDIR}/../lib \
 		-DDIRENT -DSTDC_HEADERS -DPOSIX -DBROKEN_SIGISMEMBER \
 		-DFTIME_MISSING -DHAVE_TIMEZONE -DUTIME_NULL_MISSING -DDO_LINKS
 
-LDADD=  -L${.CURDIR}/../lib/${.CURDIR} -lcvs
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lcvs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lcvs
+.endif
 
 SRCS = add.c admin.c checkin.c checkout.c classify.c commit.c \
 create_adm.c diff.c entries.c find_names.c history.c ignore.c \
@@ -14,5 +18,8 @@ status.c tag.c update.c vers_ts.c version.c
 MAN1=	cvs.1
 MAN5=	cvs.5
 
+check:
+	@echo `pwd` ${.CURDIR}
+
 .include <bsd.prog.mk>
 .include "../../Makefile.inc"
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index b00fc2c32a2f..3c68ed5530a6 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -7,4 +7,7 @@ SRCS =	argmatch.c error.c getopt.c sighandle.c strippath.c stripslash.c yesno.c
 
 CLEANFILES+= getdate.c
 
+install:
+	@echo -n
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cvs/mkmodules/Makefile b/gnu/usr.bin/cvs/mkmodules/Makefile
index 23fe4589cfc0..bec0bd6484c3 100644
--- a/gnu/usr.bin/cvs/mkmodules/Makefile
+++ b/gnu/usr.bin/cvs/mkmodules/Makefile
@@ -1,8 +1,12 @@
 PROG = mkmodules
 SRCS = mkmodules.c
-
 CFLAGS += -I${.CURDIR}/../cvs -I${.CURDIR}/../lib
-LDADD= -L${.CURDIR}/../lib/${.CURDIR} -lcvs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lcvs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lcvs
+.endif
 
 .include <bsd.prog.mk>
 .include "../../Makefile.inc"