summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-12-30 11:17:09 +0000
committerbde <bde@FreeBSD.org>1998-12-30 11:17:09 +0000
commitddd867ad2cbeb99fda71dd70db5b49179392cdaa (patch)
tree8dfa4576c88ae8c6308a9a218db2cd828a576306 /sys
parentac17bd0978cec898bf1a360020b127476de08143 (diff)
downloadFreeBSD-src-ddd867ad2cbeb99fda71dd70db5b49179392cdaa.zip
FreeBSD-src-ddd867ad2cbeb99fda71dd70db5b49179392cdaa.tar.gz
Always build ${MACHINE}/boot if it exists. Makefiles shouldn't know
about deficiencies in subdirs.
Diffstat (limited to 'sys')
-rw-r--r--sys/Makefile18
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/Makefile b/sys/Makefile
index 7245dc0..e13a51a 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,18 +1,14 @@
-# $Id: Makefile,v 1.13 1998/10/11 18:39:38 rnordier Exp $
+# $Id: Makefile,v 1.14 1998/11/03 06:50:58 peter 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
+SUBDIR= modules
-.if exists(boot) && ${MACHINE_ARCH} == "alpha"
-SUBDIR= boot
+.if ${MACHINE_ARCH} == "alpha" || ${OBJFORMAT} == "elf"
+SUBDIR+=boot
.endif
-# KLD modules build for both a.out and ELF
-SUBDIR+=modules
+.if exists(${.CURDIR}/${MACHINE}/boot)
+SUBDIR+=${MACHINE}/boot
+.endif
HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
OpenPOWER on IntegriCloud