From owner-p4-projects@FreeBSD.ORG  Sun Oct 10 18:53:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6CED716A4D1; Sun, 10 Oct 2004 18:53:11 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 41CF516A4CF
	for <perforce@freebsd.org>; Sun, 10 Oct 2004 18:53:11 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1979643D2F
	for <perforce@freebsd.org>; Sun, 10 Oct 2004 18:53:11 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9AIrAEU095847
	for <perforce@freebsd.org>; Sun, 10 Oct 2004 18:53:10 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9AIrAYI095844
	for perforce@freebsd.org; Sun, 10 Oct 2004 18:53:10 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 10 Oct 2004 18:53:10 GMT
Message-Id: <200410101853.i9AIrAYI095844@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>
Subject: PERFORCE change 62955 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 10 Oct 2004 18:53:12 -0000

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

Change 62955 by peter@peter_daintree on 2004/10/10 18:52:30

	checkpoint something that I was playing with so I dont lose it.

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#62 edit

Differences ...

==== //depot/projects/hammer/Makefile.inc1#62 (text+ko) ====

@@ -129,6 +129,7 @@
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
+I386TMP=	${OBJTREE}${.CURDIR}/i386
 # /usr/games added for fortune which depend on strfile
 BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
@@ -201,6 +202,21 @@
 		PATH=${TMPPATH}
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
+# i386 world
+I386CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
+		MACHINE_ARCH=${TARGET_ARCH} \
+		MACHINE=${TARGET} \
+		CPUTYPE=${TARGET_CPUTYPE} \
+		GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
+		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
+		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
+
+I386MAKEENV=	${I386CROSSENV} \
+		_SHLIBDIRPREFIX=${I386TMP} \
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${TMPPATH}
+I386MAKE=	${I386MAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${I386TMP}
+
 # install stage
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV=	${CROSSENV} \