From 0705911400462fcd48caa02fc8bdad1612ac2913 Mon Sep 17 00:00:00 2001 From: ache Date: Wed, 11 Jan 1995 06:42:25 +0000 Subject: Use -lgnuregex --- gnu/usr.bin/cvs/cvs/Makefile | 4 ++-- gnu/usr.bin/cvs/cvs/cvs.h | 2 +- gnu/usr.bin/cvs/lib/Makefile | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/usr.bin') diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index d506fd1..115e246 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -7,8 +7,8 @@ PROG = ncvs CFLAGS += -I${.CURDIR}/../lib \ -DDIRENT -DSTDC_HEADERS -DPOSIX -DBROKEN_SIGISMEMBER \ -DFTIME_MISSING -DHAVE_TIMEZONE -DUTIME_NULL_MISSING -DPADD+= ${LIBCVS} -LDADD+= -lcvs +DPADD+= ${LIBCVS} ${LIBGNUREGEX} +LDADD+= -lcvs -lgnuregex .if defined(FREEBSD_DEVELOPER) CFLAGS+= -DFREEBSD_DEVELOPER diff --git a/gnu/usr.bin/cvs/cvs/cvs.h b/gnu/usr.bin/cvs/cvs/cvs.h index 3e1f8f4..d8296a0 100644 --- a/gnu/usr.bin/cvs/cvs/cvs.h +++ b/gnu/usr.bin/cvs/cvs/cvs.h @@ -7,7 +7,7 @@ #include #include "hash.h" #include "rcs.h" -#include "regex.h" +#include "gnuregex.h" #include "fnmatch.h" #include "getopt.h" #include "wait.h" diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index 7712efc..56ab922 100644 --- a/gnu/usr.bin/cvs/lib/Makefile +++ b/gnu/usr.bin/cvs/lib/Makefile @@ -3,13 +3,12 @@ LIB = cvs CFLAGS += -I${.CURDIR} -I${.CURDIR}/../cvs -DFTIME_MISSING -DHAVE_TIMEZONE SRCS = argmatch.c error.c getopt.c sighandle.c strippath.c stripslash.c yesno.c \ - getdate.y fnmatch.c regex.c subr.c myndbm.c hash.c + getdate.y fnmatch.c subr.c myndbm.c hash.c CLEANFILES+= getdate.c y.tab.h NOPROFILE= yes -install: - @echo -n +install:; .include -- cgit v1.1