Make <runefile.h> internal to libc.

Suggested by:	phantom

6 files changed, 5 insertions, 9 deletions

diff --git a/include/Makefile b/include/Makefile
index c7df6f5..5774a01 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -15,7 +15,7 @@ INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
 	netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
 	proc_service.h pthread.h \
 	pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
-	resolv.h runefile.h runetype.h search.h setjmp.h sgtty.h \
+	resolv.h runetype.h search.h setjmp.h sgtty.h \
 	signal.h stab.h \
 	stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \
 	strings.h sysexits.h tar.h tgmath.h \
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index 4d37f36..9acf67d 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <arpa/inet.h>
 #include <errno.h>
 #include <runetype.h>
-#include <runefile.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -52,6 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include "un-namespace.h"
 
+#include "runefile.h"
+
 _RuneLocale *_Read_RuneMagi(FILE *);
 
 _RuneLocale *
diff --git a/include/runefile.h b/lib/libc/locale/runefile.h
index ce1e47e..ce1e47e 100644
--- a/include/runefile.h
+++ b/lib/libc/locale/runefile.h
diff --git a/tools/build/Makefile b/tools/build/Makefile
index b523f13..9f0fadd 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -9,11 +9,6 @@ INCS=
 
 BOOTSTRAPPING?=	0
 
-# usr.bin/mklocale needs <runefile.h>.
-.if !exists(/usr/include/runefile.h)
-INCS+=		runefile.h
-.endif
-
 # usr.bin/gencat needs <nl_types.h>.
 .if ${BOOTSTRAPPING} < 600017
 INCS+=		nl_types.h
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 0f0978f..9873d4e 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -4,6 +4,6 @@
 PROG=	mklocale
 WARNS?=	6
 SRCS=	yacc.y lex.l y.tab.h
-CFLAGS+= -I. -I${.CURDIR}
+CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index fc2df7e..a41d02e 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
-#include <runefile.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,6 +56,7 @@ __FBSDID("$FreeBSD$");
 
 #include "ldef.h"
 #include "extern.h"
+#include "runefile.h"
 
 static void *xmalloc(unsigned int sz);
 static uint32_t *xlalloc(unsigned int sz);