From e2d79f66c432975c8dec1678a53bf2dfb3a82941 Mon Sep 17 00:00:00 2001 From: Nate Williams Date: Fri, 25 Jun 1993 18:51:05 +0000 Subject: [PATCH] Fixed cvs to work with/without object directories and added missing rcslean directory to top level makefile. --- gnu/usr.bin/rcs/Makefile | 2 +- gnu/usr.bin/rcs/ci/Makefile | 2 +- gnu/usr.bin/rcs/co/Makefile | 2 +- gnu/usr.bin/rcs/ident/Makefile | 2 +- gnu/usr.bin/rcs/merge/Makefile | 2 +- gnu/usr.bin/rcs/rcs/Makefile | 2 +- gnu/usr.bin/rcs/rcsclean/Makefile | 2 +- gnu/usr.bin/rcs/rcsdiff/Makefile | 2 +- gnu/usr.bin/rcs/rcsmerge/Makefile | 2 +- gnu/usr.bin/rcs/rlog/Makefile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/usr.bin/rcs/Makefile b/gnu/usr.bin/rcs/Makefile index 21818151d97..4a9fd0838a0 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 diff --git a/gnu/usr.bin/rcs/ci/Makefile b/gnu/usr.bin/rcs/ci/Makefile index 9b64e0848aa..f93376a89d1 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 diff --git a/gnu/usr.bin/rcs/co/Makefile b/gnu/usr.bin/rcs/co/Makefile index e9de8da3c01..23eb9487e06 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 diff --git a/gnu/usr.bin/rcs/ident/Makefile b/gnu/usr.bin/rcs/ident/Makefile index 1a618e529b3..77850a27352 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 diff --git a/gnu/usr.bin/rcs/merge/Makefile b/gnu/usr.bin/rcs/merge/Makefile index d14afb28857..edb2c20cecb 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 diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile index d62c8d1d94c..b96e0b25ca7 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 fc0c6265527..fa9ca81b641 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 diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile b/gnu/usr.bin/rcs/rcsdiff/Makefile index 837c241dbcf..f1baa6f08c1 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 diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile index 0c1f643891b..0c6f177027d 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 diff --git a/gnu/usr.bin/rcs/rlog/Makefile b/gnu/usr.bin/rcs/rlog/Makefile index b6a126865ad..3d1fc2cc96b 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