PERFORCE change 128037 for review

[Peter Wemm]

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

Change 128037 by peter at 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