From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:23:25 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F8A316A502; Sat,  8 Dec 2007 00:23:24 +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 5B1E416A5B1
	for <perforce@freebsd.org>; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47F4B13C4E7
	for <perforce@freebsd.org>; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
	(envelope-from jb@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 lB80NOiL068628
	for <perforce@freebsd.org>; Sat, 8 Dec 2007 00:23:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80NOUQ068625
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:23:24 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 00:23:24 GMT
Message-Id: <200712080023.lB80NOUQ068625@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130443 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: Sat, 08 Dec 2007 00:23:25 -0000

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

Change 130443 by jb@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