From owner-p4-projects@FreeBSD.ORG  Wed Oct 24 22:38:47 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6894116A41A; Wed, 24 Oct 2007 22:38:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCD2F16A417
	for <perforce@freebsd.org>; Wed, 24 Oct 2007 22:38:46 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BAA8F13C48D
	for <perforce@freebsd.org>; Wed, 24 Oct 2007 22:38:46 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9OMckte090840
	for <perforce@freebsd.org>; Wed, 24 Oct 2007 22:38:46 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9OMckpY090837
	for perforce@freebsd.org; Wed, 24 Oct 2007 22:38:46 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 24 Oct 2007 22:38:46 GMT
Message-Id: <200710242238.l9OMckpY090837@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128037 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Oct 2007 22:38:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=128037

Change 128037 by peter@peter_daintree on 2007/10/24 22:38:31

	Install include32/machine files specific to i386.  These override
	the common ones in /usr/include because of the include search path.
	
	*HACK HACK HACK!*

Affected files ...

.. //depot/projects/hammer/include/Makefile#72 edit

Differences ...

==== //depot/projects/hammer/include/Makefile#72 (text+ko) ====

@@ -152,6 +152,12 @@
 	    -f ${.CURDIR}/../etc/mtree/BIND.include.dist \
 	    -p ${DESTDIR}${INCLUDEDIR}
 .endif
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	if [ -L ${DESTDIR}${INCLUDEDIR}32/machine ]; then \
+		rm -f ${DESTDIR}${INCLUDEDIR}32/machine; \
+	fi
+	mkdir -p ${DESTDIR}${INCLUDEDIR}32/machine
+.endif
 
 copies:
 .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
@@ -163,6 +169,13 @@
 	done
 .endif
 .endfor
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	mkdir -p ${DESTDIR}${INCLUDEDIR}32/machine
+	cd ${DESTDIR}${INCLUDEDIR}32/machine; \
+	for h in *.h; do \
+		if [ -L $$h ]; then rm -f $$h; fi; \
+	done
+.endif
 .for i in ${LDIRS} ${LSUBDIRS:Ndev/acpica:Ndev/bktr} ${LSUBSUBDIRS}
 	cd ${.CURDIR}/../sys; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
@@ -226,6 +239,11 @@
 	cd ${.CURDIR}/../sys/rpc; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
 	    ${DESTDIR}${INCLUDEDIR}/rpc
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	cd ${.CURDIR}/../sys/i386/include; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+	    ${DESTDIR}${INCLUDEDIR}32/machine
+.endif
 
 symlinks:
 	@${ECHO} "Setting up symlinks to kernel source tree..."
@@ -329,3 +347,10 @@
 		ln -fs ../../../sys/rpc/$$h \
 		    ${DESTDIR}${INCLUDEDIR}/rpc; \
 	done
+.if ${MACHINE_ARCH} == "amd64" && ${MK_LIB32} != "no"
+	cd ${.CURDIR}/../sys/i386/include; \
+	for h in *.h; do \
+		ln -fs ../../../sys/i386/include/$$h \
+		    ${DESTDIR}${INCLUDEDIR}32/machine; \
+	done
+.endif