From c7d467927626147e8d643da13bfc62848f70f5de Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Wed, 30 Dec 1998 12:06:08 +0000
Subject: Backed out previous commit.  It depends on a.out utilities and
 libraries somehow being available even on pure elf systems.

---
 sys/Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'sys/Makefile')

diff --git a/sys/Makefile b/sys/Makefile
index e13a51a..bca5ede 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,15 +1,19 @@
-#	$Id: Makefile,v 1.14 1998/11/03 06:50:58 peter Exp $
+#	$Id: Makefile,v 1.15 1998/12/30 11:17:09 bde Exp $
 
-SUBDIR=	modules
-
-.if ${MACHINE_ARCH} == "alpha" || ${OBJFORMAT} == "elf"
-SUBDIR+=boot
+# 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(${.CURDIR}/${MACHINE}/boot)
-SUBDIR+=${MACHINE}/boot
+.if	exists(boot) && ${MACHINE_ARCH} == "alpha"
+SUBDIR= boot
 .endif
 
+# KLD modules build for both a.out and ELF
+SUBDIR+=modules
+
 HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
 
 .include <bsd.subdir.mk>
-- 
cgit v1.1