From owner-p4-projects@FreeBSD.ORG  Fri Mar 30 01:26:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1AF516A40E; Fri, 30 Mar 2007 01:26:49 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 06AE116A401
	for <perforce@freebsd.org>; Fri, 30 Mar 2007 01:26:49 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id ECE5013C4B9
	for <perforce@freebsd.org>; Fri, 30 Mar 2007 01:26:48 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U1Qm4c012899
	for <perforce@freebsd.org>; Fri, 30 Mar 2007 01:26:48 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U1QmIl012896
	for perforce@freebsd.org; Fri, 30 Mar 2007 01:26:48 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 30 Mar 2007 01:26:48 GMT
Message-Id: <200703300126.l2U1QmIl012896@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>
Cc: 
Subject: PERFORCE change 116899 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: Fri, 30 Mar 2007 01:26:50 -0000

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

Change 116899 by peter@peter_daintree on 2007/03/30 01:26:45

	Deal with make variable name changes

Affected files ...

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

Differences ...

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

@@ -432,9 +432,9 @@
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
 	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
 	cd ${.CURDIR}/usr.bin/ldd; \
-	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	    ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t}
 	cd ${.CURDIR}/usr.bin/gcore; \
-	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	    ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t}
 .endif
@@ -442,7 +442,7 @@
 	cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t}
 .endif
 	cd ${.CURDIR}/gnu/usr.bin/cc/include; \
-	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	    ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t}
 .endfor
 .for _dir in usr.bin/lex/lib
 	cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj
@@ -457,9 +457,9 @@
 	cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t}
 	cd ${.CURDIR}/usr.bin/ldd; \
-	    PROG=ldd32 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	    PROG=ldd32 ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t}
 	cd ${.CURDIR}/usr.bin/gcore; \
-	    PROG=gcore32 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	    PROG=gcore32 ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t}
 .endfor
 
 distribute32 install32:
@@ -474,8 +474,8 @@
 	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
-	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32MAKE} ${.TARGET:S/32$//}
-	cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32WMAKE} ${.TARGET:S/32$//}
 .endif