From a305e3772783b8424dd7e92b2c3d1ac0f98b893c Mon Sep 17 00:00:00 2001
From: rnordier <rnordier@FreeBSD.org>
Date: Sun, 11 Oct 1998 18:39:38 +0000
Subject: [PATCH] In src/Makefile.inc1:     Remove /sys/boot from legacy-build.
     Add btxld to build-tools. In src/sys/Makefile:     Add /sys/boot for i386
 ELF.

I'm still not sure why the new boot code was being built along with the
legacy stuff, which meant a completely wrong default environment for it.

This may well still be the wrong way to go about this, but it can't work
all that much worse than it has been.
---
 Makefile.inc1 | 5 ++---
 sys/Makefile  | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index c367e0113f47..e2e64e7c20ba 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.29 1998/10/10 19:56:59 jkh Exp $
+#	$Id: Makefile.inc1,v 1.30 1998/10/11 07:41:31 peter Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -824,6 +824,7 @@ build-tools:
 		usr.bin/wc		\
 		usr.bin/xargs		\
 		usr.bin/yacc		\
+		usr.sbin/btxld		\
 		usr.sbin/chown		\
 		usr.sbin/mtree		\
 		usr.sbin/zic		\
@@ -897,8 +898,6 @@ legacy-build:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Building legacy boot"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/sys/boot && ${XMAKE} -DNOMAN -B obj depend; \
-		${XMAKE} -DNOMAN OBJFORMAT=elf all
 	cd ${.CURDIR}/sys/${MACHINE}/boot && \
 		${XMAKE} -DNOMAN -B obj depend; ${XMAKE} -DNOMAN all;
 .endif
diff --git a/sys/Makefile b/sys/Makefile
index 02f77bf089dc..470207db8201 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,8 +1,10 @@
-#	$Id: Makefile,v 1.11 1998/09/05 08:27:56 jb Exp $
+#	$Id: Makefile,v 1.12 1998/10/04 00:42:08 gpalmer Exp $
 
 # This is the old aout only boot loader.
 .if	exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout"
 SUBDIR=	${MACHINE}/boot
+.elif	exists(boot) && ${MACHINE} == "i386" && ${OBJFORMAT} == "elf"
+SUBDIR=	boot
 .endif
 
 .if	exists(boot) && ${MACHINE_ARCH} == "alpha"