From 9fa28ff687d8760285c747494f0e562f7ba8a4d5 Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 6 Jul 2007 07:20:59 +0000
Subject: [PATCH] I4B header files were repo-copied from sys/i386/include to
 sys/i4b/include/ so they will be available to all architectures once I4B
 compiles on those.

I4B header files are now installed in include/i4b/ and no longer
in include/machine/.

For now we still install the headers for i386 only.

Approved by:	re (kensmith)
---
 etc/mtree/BSD.include.dist |  2 ++
 include/Makefile           | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index a200e5655fc0..d38c479be161 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -183,6 +183,8 @@
     ..
     gssapi
     ..
+    i4b
+    ..
     isofs
         cd9660
         ..
diff --git a/include/Makefile b/include/Makefile
index f03e030bbeed..20d8d151dbf5 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -26,6 +26,9 @@ INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
 	ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \
 	wctype.h wordexp.h
 
+I4BHDRS=i4b_cause.h i4b_debug.h i4b_ioctl.h i4b_rbch_ioctl.h \
+	i4b_tel_ioctl.h i4b_trace.h
+
 MHDRS=	float.h floatingpoint.h stdarg.h
 
 PHDRS=	sched.h semaphore.h _semaphore.h
@@ -175,6 +178,13 @@ copies:
 	cd ${.CURDIR}/../sys/crypto; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \
 	    ${DESTDIR}${INCLUDEDIR}/crypto
+.if ${MACHINE_ARCH} == "i386"
+.if ${MK_I4B} != "no"
+	cd ${.CURDIR}/../sys/i4b/include; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${I4BHDRS} \
+	    ${DESTDIR}${INCLUDEDIR}/i4b
+.endif
+.endif
 	cd ${.CURDIR}/../sys/opencrypto; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/crypto
@@ -256,6 +266,11 @@ symlinks:
 		ln -fs ../../../sys/crypto/$$h \
 		    ${DESTDIR}${INCLUDEDIR}/crypto; \
 	done
+	cd ${.CURDIR}/../sys/i4b/include; \
+	for h in ${I4BHDRS}; do \
+		ln -fs ../../../sys/i4b/include/$$h \
+		    ${DESTDIR}${INCLUDEDIR}/i4b; \
+	done
 	cd ${.CURDIR}/../sys/opencrypto; \
 	for h in *.h; do \
 		ln -fs ../../../sys/opencrypto/$$h \