From 78ca0f3f54c63c8265e6223ab83c024a88be7e66 Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Sun, 15 Oct 2006 04:24:11 +0000
Subject: [PATCH] Don't add `-I${NETBSDSRCDIR}/sys' to HOST_CPPFLAGS to pull
 necessary target system headers (<fs/unicode.h> and <fs/cd9660/iso.h>)
 because system headers for the host (like <sys/stat.h>) are also pulled from
 there and it causes build errors if target src tree is different from
 installed one on the host. Instead, copy the necessary system headers for
 host's programs into ${.OBJDIR} first.

Problem reported from Geert Hendrickx, and there is no particular comment
on tech-toolchain.
---
 distrib/cdrom/macppc_installboot/Makefile | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/distrib/cdrom/macppc_installboot/Makefile b/distrib/cdrom/macppc_installboot/Makefile
index 8a2dc8f709b1..344753cd2e26 100644
--- a/distrib/cdrom/macppc_installboot/Makefile
+++ b/distrib/cdrom/macppc_installboot/Makefile
@@ -1,10 +1,24 @@
-#	$NetBSD: Makefile,v 1.6 2006/09/17 03:56:03 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.7 2006/10/15 04:24:11 tsutsui Exp $
 
 HOSTPROG=	macppc_installboot
 SRCS=		installboot.c cd9660.c cd9660_util.c
 NOMAN=	# defined
 
-HOST_CPPFLAGS+=	-I${.CURDIR} -I${NETBSDSRCDIR}/sys
+HOST_CPPFLAGS+=	-I. -I${.CURDIR}
 #HOST_CPPFLAGS+=	-DDEBUG
 
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+	-rm -rf fs
+	${HOST_INSTALL_DIR} fs
+	${HOST_INSTALL_DIR} fs/cd9660
+	${HOST_INSTALL_FILE} ${NETBSDSRCDIR}/sys/fs/unicode.h fs
+	${HOST_INSTALL_FILE} ${NETBSDSRCDIR}/sys/fs/cd9660/iso.h fs/cd9660
+.endif
+
+cleandir distclean: cleaninc
+
+cleaninc:
+	-rm -rf fs
+
 .include <bsd.hostprog.mk>