From 5c1d6ea34629afacc0fbd9a017f0edf499f495d9 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 30 Mar 2002 06:55:17 +0000
Subject: [PATCH] Fix shark release building targets.

---
 distrib/shark/Makefile                       | 15 +++++++++++++++
 distrib/shark/instkernel/Makefile.inc        |  4 ----
 distrib/shark/instkernel/instkernel/Makefile | 10 +++-------
 distrib/shark/instkernel/ramdisk/Makefile    |  6 +++---
 etc/etc.shark/Makefile.inc                   |  9 ++++-----
 5 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 distrib/shark/Makefile
 delete mode 100644 distrib/shark/instkernel/Makefile.inc

diff --git a/distrib/shark/Makefile b/distrib/shark/Makefile
new file mode 100644
index 000000000000..aecebeb17cdf
--- /dev/null
+++ b/distrib/shark/Makefile
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2002/03/30 06:55:18 thorpej Exp $
+
+.include <bsd.own.mk>		# Use /etc/mk.conf.
+
+SUBDIR=	instkernel
+
+ITARGET=	${RELEASEDIR}/installation
+IINST=		${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE}
+
+INSTKERNOBJ!=	cd ${.CURDIR}/instkernel/instkernel && ${PRINTOBJDIR}
+
+release: check_RELEASEDIR
+	${IINST} ${INSTKERNOBJ}/netbsd.gz ${ITARGET}/instkernel/.
+
+.include <bsd.subdir.mk>
diff --git a/distrib/shark/instkernel/Makefile.inc b/distrib/shark/instkernel/Makefile.inc
deleted file mode 100644
index 5b3eb21e1445..000000000000
--- a/distrib/shark/instkernel/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2002/02/11 17:49:40 thorpej Exp $
-
-REV!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh -s
-VER!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh
diff --git a/distrib/shark/instkernel/instkernel/Makefile b/distrib/shark/instkernel/instkernel/Makefile
index ed7005d26fde..49afc2fbfd79 100644
--- a/distrib/shark/instkernel/instkernel/Makefile
+++ b/distrib/shark/instkernel/instkernel/Makefile
@@ -1,18 +1,14 @@
-#	$NetBSD: Makefile,v 1.3 2002/03/05 21:23:31 thorpej Exp $
-
-.include <bsd.own.mk>
+#	$NetBSD: Makefile,v 1.4 2002/03/30 06:55:18 thorpej Exp $
 
 .include "../../../../Makefile.inc"
+.include <bsd.own.mk>
 
 TOP=	${.CURDIR}/../../../..
 
-RAMDISKDIR!=	${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
+RAMDISKDIR!=	cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
 RAMDISK=	${RAMDISKDIR}/ramdisk.fs
 
-MDSETIMAGE?=	mdsetimage
 KERNEL?=${KERNOBJDIR}/INSTALL/netbsd
-KERNEL=/sys/arch/shark/compile/INSTALL/netbsd
-STRIP?=		strip		# make STRIP=echo can be useful
 
 all:
 	cp ${KERNEL} netbsd
diff --git a/distrib/shark/instkernel/ramdisk/Makefile b/distrib/shark/instkernel/ramdisk/Makefile
index 41744d698e7b..f83728df1c71 100644
--- a/distrib/shark/instkernel/ramdisk/Makefile
+++ b/distrib/shark/instkernel/ramdisk/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2002/03/30 00:35:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2002/03/30 06:55:18 thorpej Exp $
 
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${.CURDIR}/../../../Makefile.inc"
 .include <bsd.own.mk>
 
 IMAGE=		ramdisk.fs
@@ -11,7 +11,7 @@ WARNS=		1
 CRUNCHBIN=	ramdiskbin
 LISTS=		${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
 MTREECONF=	${DISTRIBDIR}/common/mtree.common
-IMAGEENDIAN=	be
+IMAGEENDIAN=	le
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		disktab.preinstall dot.hdprofile dot.profile \
diff --git a/etc/etc.shark/Makefile.inc b/etc/etc.shark/Makefile.inc
index be9b6492f77e..16647ac07bd9 100644
--- a/etc/etc.shark/Makefile.inc
+++ b/etc/etc.shark/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.2 2002/03/20 17:05:53 bjh21 Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2002/03/30 06:55:17 thorpej Exp $
 #
 #	etc.shark/Makefile.inc -- shark-specific etc Makefile targets
 #
@@ -7,8 +7,7 @@ KERNEL_SETS=		GENERIC
 
 BUILD_KERNELS=		INSTALL
 
-INSTALLATION_DIRS+=	installation/kernel \
-			installation/misc
+INSTALLATION_DIRS+=	installation/instkernel
 
 # Build the release notes and boot floppies and install them
 snap_md_post:
@@ -18,5 +17,5 @@ snap_md_post:
 	cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE}
 	cd ${.CURDIR}/../distrib/shark && ${MAKE} release
 	cd ${.CURDIR}/../distrib/notes && ${MAKE} release
-	sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/kernel '*.gz'
-	sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/misc '*.gz'
+	sh ../distrib/sets/makesums -t \
+	    ${RELEASEDIR}/installation/instkernel '*.gz'