Index: projects/bmake/lib/csu/Makefile.inc
===================================================================
--- projects/bmake/lib/csu/Makefile.inc	(revision 275337)
+++ projects/bmake/lib/csu/Makefile.inc	(revision 275338)
@@ -1,9 +1,14 @@
 # $FreeBSD$
 
 SSP_CFLAGS=
 
 SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/'
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
 .include "../Makefile.inc"
+
+.if ${MK_STAGING} == "yes" && ${.TARGETS:Nall} == ""
+FILES?= ${OBJS}
+FILESDIR?= ${LIBDIR}
+.endif
Index: projects/bmake/lib/csu/amd64/Makefile
===================================================================
--- projects/bmake/lib/csu/amd64/Makefile	(revision 275337)
+++ projects/bmake/lib/csu/amd64/Makefile	(revision 275338)
@@ -1,48 +1,45 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
 CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
 CFLAGS+=	-fno-omit-frame-pointer
 
-FILES=		${OBJS}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESMODE=	${LIBMODE}
-FILESDIR=	${LIBDIR}
-
 all: ${OBJS}
 
 CLEANFILES=	${OBJS}
 CLEANFILES+=	crt1.s gcrt1.s Scrt1.s
 
 # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not
 # directly compiled to .o files.
 
 crt1.s: crt1.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c
 	sed ${SED_FIX_NOTE} ${.TARGET}
 
 crt1.o: crt1.s
 	${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s
 
 gcrt1.s: crt1.c
 	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c
 	sed ${SED_FIX_NOTE} ${.TARGET}
 
 gcrt1.o: gcrt1.s
 	${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s
 
 Scrt1.s: crt1.c
 	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c
 	sed ${SED_FIX_NOTE} ${.TARGET}
 
 Scrt1.o: Scrt1.s
 	${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s
 
+realinstall:
+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    ${OBJS} ${DESTDIR}${LIBDIR}
 
-.include <bsd.prog.mk>
+.include <bsd.lib.mk>
Index: projects/bmake/lib/csu/i386-elf/Makefile.depend
===================================================================
--- projects/bmake/lib/csu/i386-elf/Makefile.depend	(revision 275337)
+++ projects/bmake/lib/csu/i386-elf/Makefile.depend	(revision 275338)
@@ -1,15 +1,13 @@
 # Autogenerated - do NOT edit!
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	include \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif