2 files changed, 20 insertions, 15 deletions

diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index cea84dd9a823..5c127a070b74 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,11 +1,14 @@
 #
-# $Id$
+# $Id: Makefile.alpha,v 1.1 1998/03/12 02:55:20 jdp Exp $
 #
 
-EMULATION=	elf64alpha
+.if	${MACHINE_ARCH} == "alpha"
 HOST=		alpha-unknown-freebsdelf
-TARGET=		alpha-unknown-freebsdelf
-LDSCRIPTS=	elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \
+CFLAGS+=	-DDEFAULT_EMULATION=\"elf64alpha\"
+CFLAGS+=	-DTARGET=\"alpha-unknown-freebsdelf\"
+.endif
+EMS+=		ld_elf64alpha_emulation
+LDSCRIPTS+=	elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \
 		elf64alpha.xs elf64alpha.xu alpha.x alpha.xbn \
 		alpha.xn alpha.xr alpha.xu
 SRCS+=		eelf64alpha.c ealpha.c
@@ -16,11 +19,11 @@ beforedepend: eelf64alpha.c ealpha.c
 eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
 	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
-	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
-	    ${EMULATION} ${TARGET}
+	    ${HOST} alpha-unknown-freebsdelf alpha-unknown-freebsdelf \
+	    elf64alpha ""  elf64alpha alpha-unknown-freebsdelf
 
 ealpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
 	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
-	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
-	    alpha alpha-unknown-freebsd
+	    ${HOST} alpha-unknown-freebsdelf alpha-unknown-freebsdelf \
+	    elf64alpha ""  alpha alpha-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 8aedcb3bc82a..cca7a797f938 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,12 +1,14 @@
 #
-# $Id: Makefile.i386,v 1.1 1998/03/12 02:55:21 jdp Exp $
+# $Id: Makefile.i386,v 1.2 1998/03/30 02:21:20 jdp Exp $
 #
 
-BINDIR=		/usr/libexec/elf
-EMULATION=	elf_i386
+.if	${MACHINE_ARCH} == "i386"
 HOST=		i386-unknown-freebsdelf
-TARGET=		i386-unknown-freebsdelf
-LDSCRIPTS=	elf_i386.x elf_i386.xbn elf_i386.xn elf_i386.xr \
+CFLAGS+=	-DDEFAULT_EMULATION=\"elf_i386\"
+CFLAGS+=	-DTARGET=\"i386-unknown-freebsdelf\"
+.endif
+EMS+=		ld_elf_i386_emulation
+LDSCRIPTS+=	elf_i386.x elf_i386.xbn elf_i386.xn elf_i386.xr \
 		elf_i386.xs elf_i386.xu
 SRCS+=		eelf_i386.c
 CLEANFILES+=	eelf_i386.c
@@ -17,5 +19,5 @@ eelf_i386.c:	emulparams/elf_i386.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
 	env LIB_PATH="/usr/lib" \
 	    sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
-	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
-	    ${EMULATION} ${TARGET}
+	    ${HOST} i386-unknown-freebsdelf i386-unknown-freebsdelf \
+	    elf_i386 "" elf_i386 i386-unknown-freebsdelf