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.
This commit is contained in:
Nate Williams 1993-07-06 19:12:57 +00:00
parent 67b32f8a64
commit 18b45b34dc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=99
3 changed files with 17 additions and 3 deletions

View File

@ -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"

View File

@ -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>

View File

@ -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"