Put lib/csu/amd64/Makefile back the way it is in head

and handle staging via ../Makefile.inc

3 files changed, 9 insertions, 9 deletions

diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index 95d5c5e5f355..ff77f668b368 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -7,3 +7,8 @@ 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
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index 5ddbab661f43..80d14a7ae7af 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -9,12 +9,6 @@ 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}
@@ -44,5 +38,8 @@ Scrt1.s: crt1.c
 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>
diff --git a/lib/csu/i386-elf/Makefile.depend b/lib/csu/i386-elf/Makefile.depend
index ff699f730be6..7d982eb5c63a 100644
--- a/lib/csu/i386-elf/Makefile.depend
+++ b/lib/csu/i386-elf/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	include \