Date: Thu, 13 Apr 2006 00:26:28 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 95124 for review Message-ID: <200604130026.k3D0QSuu005371@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=95124 Change 95124 by soc-andrew@soc-andrew_serv on 2006/04/13 00:26:20 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#5 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#16 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ SUBDIR= lua lualib -SUBDIR+= compat51 mime posix socket +#SUBDIR+= compat51 mime posix socket .include <bsd.subdir.mk> ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.292 2006/03/21 11:00:54 ru Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.293 2006/04/12 19:52:34 ru Exp $ .include <bsd.own.mk> @@ -263,7 +263,7 @@ _chkey= chkey _newkey= newkey .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -.if ${MK_LIBC_R} != "no" +.if ${MK_LIBTHR} != "no" _csup= csup .endif .elif ${MK_LIBPTHREAD} != "no" ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.348 2006/03/20 14:24:58 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.349 2006/04/12 19:52:34 ru Exp $ .include <bsd.own.mk> @@ -320,7 +320,7 @@ .if ${MACHINE_ARCH} == "alpha" _elf2exe= elf2exe _pnpinfo= pnpinfo -.if ${MK_LIBC_R} != "no" +.if ${MK_LIBTHR} != "no" _pppctl= pppctl .endif .endif @@ -369,7 +369,7 @@ .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump -.if ${MK_LIBC_R} != "no" +.if ${MK_LIBTHR} != "no" _pppctl= pppctl .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604130026.k3D0QSuu005371>