Be explicit about which regex.h file we are including. This reduces the

need for hack workarounds in tools/lib32/build32.sh.

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>