Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Mar 2007 01:26:48 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 116899 for review
Message-ID:  <200703300126.l2U1QmIl012896@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703300126.l2U1QmIl012896>