From da93b590fb2612408e8b7eceab58dcb3cfd6c34d Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Sun, 7 Nov 1999 05:59:25 +0000
Subject: [PATCH] After a repo copy of as_{alpha,i386,mips} to
 {alpha,i386,mips}-freebsd, tidy up the logic that works out which
 sub-directories to build.

The new directories with freebsdelf suffixes now have freebsd suffixes
after a repo move by Peter at the request of David O'Brien.
---
 gnu/usr.bin/binutils/as/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 8c2f8987e85..4de352e3d2f 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -5,6 +5,7 @@
 .include "${.CURDIR}/../Makefile.inc0"
 
 GASES=		${BINUTIL_ARCH}
+FORMATS=	freebsd
 
 # Only build the cross tools when not cross-compiling.
 __MA!=/sbin/sysctl -b hw.machine_arch
@@ -17,19 +18,21 @@ GASES+=$(_g)
 .endif
 .endfor
 .endif
+.if defined(CROSS_FORMATS)
+.for _f in ${CROSS_FORMATS}
+.if (${FORMATS:R:M${_f:R}} == "")
+FORMATS+=$(_f)
+.endif
+.endfor
+.endif
 .endif
 
 .for _g in ${GASES}
-.if exists(${.CURDIR}/as_${_g})
-SUBDIR+=	as_${_g}
-.endif
-.if defined(CROSS_FORMATS)
-.for _f in ${CROSS_FORMATS}
+.for _f in ${FORMATS}
 .if exists(${.CURDIR}/${_g}-${_f})
 SUBDIR+=	${_g}-${_f}
 .endif
 .endfor
-.endif
 .endfor
 
 .include <bsd.subdir.mk>