[src/trunk]: src/distrib/news68k/floppies Include bsd.subdir.mk first to pull...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2ef57d4d6755
branches:  trunk
changeset: 488082:2ef57d4d6755
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jun 17 18:37:43 2000 +0000

description:
Include bsd.subdir.mk first to pull in /etc/mk.conf (via bsd.own.mk).
Otherwise, ".ifndef RELEASEDIR" fails if RELEASEDIR is defined in mk.conf.

diffstat:

 distrib/news68k/floppies/bootfloppy/Makefile     |  4 ++--
 distrib/news68k/floppies/ramdisk-kernel/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 67f381f2a7d5 -r 2ef57d4d6755 distrib/news68k/floppies/bootfloppy/Makefile
--- a/distrib/news68k/floppies/bootfloppy/Makefile      Sat Jun 17 18:19:10 2000 +0000
+++ b/distrib/news68k/floppies/bootfloppy/Makefile      Sat Jun 17 18:37:43 2000 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2000/06/14 10:24:24 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.6 2000/06/17 18:37:43 tsutsui Exp $
 
 TOP=           ${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
+.include <bsd.subdir.mk>
 
 IMAGE=         boot.fs
 .if !make(print-objdir)
@@ -72,4 +73,3 @@
        dd if=${IMAGE} of=${FD_RDEV} bs=45k
 
 .include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff -r 67f381f2a7d5 -r 2ef57d4d6755 distrib/news68k/floppies/ramdisk-kernel/Makefile
--- a/distrib/news68k/floppies/ramdisk-kernel/Makefile  Sat Jun 17 18:19:10 2000 +0000
+++ b/distrib/news68k/floppies/ramdisk-kernel/Makefile  Sat Jun 17 18:37:43 2000 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2000/06/11 11:35:20 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.2 2000/06/17 18:37:44 tsutsui Exp $
 
 TOP=           ${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 .include <bsd.kernobj.mk>
+.include <bsd.subdir.mk>
 
 KERN=          ${KERNOBJDIR}/INSTALL/netbsd
 .if !make(print-objdir)
@@ -36,4 +37,3 @@
        rm -f *.core ${CLEANFILES}
 
 .include <bsd.obj.mk>
-.include <bsd.subdir.mk>