diff options
| author | nate <nate@FreeBSD.org> | 1993-07-06 19:12:57 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1993-07-06 19:12:57 +0000 |
| commit | 94de632d7338726962baf99b25deb137e18f116c (patch) | |
| tree | 928b1500082662a1cb3b70843cc4b1a9e2d56c90 /gnu/usr.bin/cvs | |
| parent | bf3a05faf0739b7602c0e2c599bbe2658426f4f5 (diff) | |
| download | FreeBSD-src-94de632d7338726962baf99b25deb137e18f116c.zip FreeBSD-src-94de632d7338726962baf99b25deb137e18f116c.tar.gz | |
Really fixed the obj/noobj problems in CVS, and also made it so a
make install did not install libcvs in /usr/lib, since it has no
reason to do that.
Diffstat (limited to 'gnu/usr.bin/cvs')
| -rw-r--r-- | gnu/usr.bin/cvs/cvs/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/lib/Makefile | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/mkmodules/Makefile | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index 3f53af5..37ea28c0a 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 b00fc2c..3c68ed5 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 23fe458..bec0bd6 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" |
