From 89096bf0ef71c95ea84fd6480862896cd3a03fbb Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 25 Jan 1999 01:47:49 +0000
Subject: [PATCH] Fix an aout-to-elf upgrade failure.  Don't let the kernel
 Makefile think it's in ELF mode and upgrading /kernel.

---
 Makefile.upgrade | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.upgrade b/Makefile.upgrade
index c32b3186860..16002217ec3 100644
--- a/Makefile.upgrade
+++ b/Makefile.upgrade
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.upgrade,v 1.8 1999/01/07 06:30:14 peter Exp $
+#	$Id: Makefile.upgrade,v 1.9 1999/01/07 07:20:41 peter Exp $
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
@@ -291,7 +291,8 @@ ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot	:
 	@echo "--------------------------------------------------------------"
 	@echo " Installing a new GENERICupgrade kernel"
 	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; make install
+	@cd ${.CURDIR}/sys/compile/GENERICupgrade; \
+		OBJFORMAT=aout make KERNFORMAT=aout install
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Rebooting......."