PERFORCE change 130443 for review

[John Birrell]

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

Change 130443 by jb at jb_freebsd1 on 2007/12/08 00:22:57

	Update to account for different include file strategy.

Affected files ...

.. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#9 edit

Differences ...

==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#9 (text+ko) ====

@@ -1,10 +1,18 @@
 # $FreeBSD$
 
+.if ${MACHINE_ARCH} == "amd64"
+ARCHDIR=	i386
+.else
+ARCHDIR=	${MACHINE_ARCH}
+.endif
+
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/uts/common/dtrace
 .PATH: ${.CURDIR}/../../../cddl/dev/dtrace
-.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR}
 
 KMOD=		dtrace
-SRCS=		dtrace.c \
+SRCS=		dtrace.c
+UYUYSRCS=	\
 		dtrace_mutex.c \
 		dtrace_asm.S \
 		dtrace_subr.c
@@ -16,11 +24,10 @@
 
 SRCS+=		bus_if.h device_if.h vnode_if.h
 
-CFLAGS+=	-I${.CURDIR}/../../../cddl/dev/dtrace \
-		-I${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH} \
-		-I${.CURDIR}/../../../contrib/opensolaris/compat \
+CFLAGS+=	-I${.CURDIR}/../../../compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/dev/dtrace \
+		-I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \
 		-I${.CURDIR}/../../../contrib/opensolaris/uts/common \
-		-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../.. -DDIS_MEM
 
 CFLAGS+=	-DDEBUG