From owner-p4-projects@FreeBSD.ORG  Sun Jan 13 00:39:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 39EAB16A41B; Sun, 13 Jan 2008 00:39:41 +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 DF96316A417
	for <perforce@freebsd.org>; Sun, 13 Jan 2008 00:39:40 +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 CCF1A13C461
	for <perforce@freebsd.org>; Sun, 13 Jan 2008 00:39:40 +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 m0D0de8X059327
	for <perforce@freebsd.org>; Sun, 13 Jan 2008 00:39:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0D0dem3059324
	for perforce@freebsd.org; Sun, 13 Jan 2008 00:39:40 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 13 Jan 2008 00:39:40 GMT
Message-Id: <200801130039.m0D0dem3059324@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 133145 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: Sun, 13 Jan 2008 00:39:41 -0000

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

Change 133145 by jb@jb_freebsd1 on 2008/01/13 00:39:15

	We need /usr/lib32/dtrace to to put the 32-bit DTrace runtime
	initialisation object in.
	
	Install the 32-bit CDDL libs too.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#35 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#35 (text+ko) ====

@@ -482,10 +482,15 @@
 distribute32 install32:
 .if make(distribute32)
 	mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32	# XXX add to mtree
+	mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace	# XXX add to mtree
 .else
 	mkdir -p ${DESTDIR}/usr/lib32			# XXX add to mtree
+	mkdir -p ${DESTDIR}/usr/lib32/dtrace		# XXX add to mtree
 .endif
 	cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.if ${MK_CDDL} != "no"
+	cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}