--oplxJGu+Ee5xywIT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Mar 24, 2005 at 07:40:21PM -0600, David Young wrote:
> Following some suggestions from James Chacon, I have simplified
> the patches.  Fewer files are affected, now.  Basically, I copy
> disklabel*.h from sys/sys/ and sys/arch/${MACHINE}/include/ into
> ${TOOLDIR}/include/sys/ and ${TOOLDIR}/include/${MACHINE}/, make the
> link ${TOOLDIR}/include/machine/, and add -I${TOOLDIR}/include to the
> HOST_CPPFLAGS.

A straggler: Makefile.disklabel belongs in tools/.

Dave

-- 
David Young             OJC Technologies
dyoung@ojctech.com      Urbana, IL * (217) 278-3933

--oplxJGu+Ee5xywIT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.disklabel"

#	$NetBSD$

_ARCHDIR=	${.CURDIR}/../../sys/arch
_SYSDIR=	${.CURDIR}/../../sys/sys
_SUBDIR!=	cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
_ARCH_INCS!=	cd ${_ARCHDIR} && \
		find ${_SUBDIR:O:u} \( -name disklabel.h -o -name dkbad.h \)
_INCS=		${_SYSDIR}/disklabel.h ${_SYSDIR}/disklabel_acorn.h \
		${_SYSDIR}/disklabel_gpt.h ${_SYSDIR}/dkbad.h \
		${_SYSDIR}/bootblock.h

HOST_CPPFLAGS+=	-I${TOOLDIR}/include

beforedepend:
	${HOST_INSTALL_DIR} ${TOOLDIR}/include/${MACHINE}
	${HOST_INSTALL_DIR} ${TOOLDIR}/include/sys
	cd ${_ARCHDIR} && \
	    ${HOST_INSTALL_FILE} -c $(_ARCH_INCS) ${TOOLDIR}/include/${MACHINE}
	cd ${TOOLDIR}/include && rm -f machine && \
	    ${HOST_INSTALL_SYMLINK} ${MACHINE} machine
	${HOST_INSTALL_FILE} -c ${_INCS} ${TOOLDIR}/include/sys

--oplxJGu+Ee5xywIT--