summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2004-09-16 01:39:13 +0000
committerpeter <peter@FreeBSD.org>2004-09-16 01:39:13 +0000
commitb402daf66a99efb7dd14924ac1b96d114795af78 (patch)
treeedcc99bdb591d9ff1e1fa968fabb7be1731ca754 /gnu
parent70ad7978cb1ff01271a966e79e2502ccbea451db (diff)
downloadFreeBSD-src-b402daf66a99efb7dd14924ac1b96d114795af78.zip
FreeBSD-src-b402daf66a99efb7dd14924ac1b96d114795af78.tar.gz
Be explicit about which regex.h file we are including. This reduces the
need for hack workarounds in tools/lib32/build32.sh.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libregex/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 794c6ea..32ad7db 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -5,10 +5,10 @@ SUBDIR+= doc
LIB= gnuregex
SHLIB_MAJOR= 2
-SRCS= regex.c
+SRCS= gnuregex.c
INCSGROUPS= INCS WRINCS PXINCS
INCS= regex.h.patched
-CLEANFILES+= regex.h.patched
+CLEANFILES+= regex.h.patched gnuregex.c
INCSNAME= regex.h
INCSDIR= ${INCLUDEDIR}/gnu
WRINCS= gnuregex.h
@@ -16,10 +16,14 @@ PXINCS= posix/regex.h
PXINCSDIR= ${INCLUDEDIR}/gnu/posix
NOMAN= noman
-CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS -I${DESTDIR}/usr/include/gnu
+CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS
regex.h.patched: regex.h
sed 's=<posix/regex\.h>=<gnu/posix/regex.h>=g' \
< ${.ALLSRC} > ${.TARGET}
+gnuregex.c: regex.c
+ sed 's=<regex\.h>=<gnu/regex.h>=g' \
+ < ${.ALLSRC} > ${.TARGET}
+
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud