diff options
| author | ache <ache@FreeBSD.org> | 2004-02-16 23:25:49 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2004-02-16 23:25:49 +0000 |
| commit | 7c2c6064f7e15ad9aa9c35741d4958dd59ffbf84 (patch) | |
| tree | a30187f72c8288f741d3e2746d66fde9536e5138 /gnu/usr.bin/cvs | |
| parent | 6132c8b55e5cb27f9982f38663d7e9350bfeb453 (diff) | |
| download | FreeBSD-src-7c2c6064f7e15ad9aa9c35741d4958dd59ffbf84.zip FreeBSD-src-7c2c6064f7e15ad9aa9c35741d4958dd59ffbf84.tar.gz | |
Switch back to regex.h and fix error when mismatched regex.h used with
system libgnuregex
Diffstat (limited to 'gnu/usr.bin/cvs')
| -rw-r--r-- | gnu/usr.bin/cvs/cvs/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/lib/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/libdiff/Makefile | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index 205a474..dced5e5 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -24,8 +24,10 @@ SRCS= add.c admin.c annotate.c buffer.c \ server.c status.c subr.c tag.c update.c vers_ts.c version.c watch.c \ wrapper.c zlib.c -CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \ - -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff -I. +# gnu must be before lib to pick correct regex.h +CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \ + -I${.CURDIR}/../../../../../include/gnu \ + -I${CVSDIR}/lib -I${CVSDIR}/diff -I. DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index 441f54b..02f8e53 100644 --- a/gnu/usr.bin/cvs/lib/Makefile +++ b/gnu/usr.bin/cvs/lib/Makefile @@ -11,7 +11,10 @@ MAINTAINER= peter@FreeBSD.org LIB= cvs INTERNALLIB= YES -CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib +# gnu must be before lib to pick correct regex.h +CFLAGS+= -I. -I${CVSDIR}/src \ + -I${.CURDIR}/../../../../../include/gnu \ + -I${CVSDIR}/lib CFLAGS+= -DHAVE_CONFIG_H YFLAGS= CLEANFILES+= config.h diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile index d68a494..534b82d 100644 --- a/gnu/usr.bin/cvs/libdiff/Makefile +++ b/gnu/usr.bin/cvs/libdiff/Makefile @@ -9,7 +9,10 @@ MAINTAINER= peter@FreeBSD.org LIB= diff INTERNALLIB= YES -CFLAGS+= -I../lib -I${CVSDIR}/lib -DHAVE_CONFIG_H +# gnu must be before lib to pick correct regex.h +CFLAGS+= -I../lib \ + -I${.CURDIR}/../../../../../include/gnu \ + -I${CVSDIR}/lib -DHAVE_CONFIG_H SRCS = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \ normal.c ifdef.c util.c dir.c version.c diff.h side.c |
