summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/cvs/lib
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2004-02-16 23:25:49 +0000
committerache <ache@FreeBSD.org>2004-02-16 23:25:49 +0000
commit7c2c6064f7e15ad9aa9c35741d4958dd59ffbf84 (patch)
treea30187f72c8288f741d3e2746d66fde9536e5138 /gnu/usr.bin/cvs/lib
parent6132c8b55e5cb27f9982f38663d7e9350bfeb453 (diff)
downloadFreeBSD-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/lib')
-rw-r--r--gnu/usr.bin/cvs/lib/Makefile5
1 files changed, 4 insertions, 1 deletions
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
OpenPOWER on IntegriCloud