[src/trunk]: src/distrib Obey MKKMOD=no.

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

details:   https://anonhg.NetBSD.org/src/rev/aed10f09fe5f
branches:  trunk
changeset: 809531:aed10f09fe5f
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 19 10:16:55 2015 +0000

description:
Obey MKKMOD=no.
>From Rin Okuyama in PR install/50061.

diffstat:

 distrib/amd64/Makefile                    |   6 +++++-
 distrib/amd64/cdroms/Makefile.cdrom       |   7 +++++--
 distrib/i386/Makefile                     |   6 +++++-
 distrib/i386/cdroms/Makefile.cdrom        |   7 +++++--
 distrib/sparc64/cdroms/installcd/Makefile |  13 ++++++++-----
 5 files changed, 28 insertions(+), 11 deletions(-)

diffs (105 lines):

diff -r 8aea27bfa3e4 -r aed10f09fe5f distrib/amd64/Makefile
--- a/distrib/amd64/Makefile    Sun Jul 19 09:26:50 2015 +0000
+++ b/distrib/amd64/Makefile    Sun Jul 19 10:16:55 2015 +0000
@@ -1,11 +1,15 @@
-#      $NetBSD: Makefile,v 1.9 2015/01/12 19:40:48 snj Exp $
+#      $NetBSD: Makefile,v 1.10 2015/07/19 10:16:55 martin Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR=
 SUBDIR+=       ramdisks
 SUBDIR+=       .WAIT
 SUBDIR+=       instkernel
+.if ${MKKMOD} != "no"
 SUBDIR+=       kmod
 SUBDIR+=       kmod-cgdroot
+.endif
 SUBDIR+=       .WAIT
 SUBDIR+=       cdroms
 SUBDIR+=       liveimage
diff -r 8aea27bfa3e4 -r aed10f09fe5f distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Sun Jul 19 09:26:50 2015 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Sun Jul 19 10:16:55 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.19 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.20 2015/07/19 10:16:55 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,10 @@
 CDINSTKERNEL=  ../../instkernel
 CDKERNELS=     netbsd-GENERIC.gz       netbsd
 CDRELEASE_NOISOS=      true
-CD_SETS=       base etc modules
+CD_SETS=       base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=      modules
+.endif
 
 image_md_pre:
        ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
diff -r 8aea27bfa3e4 -r aed10f09fe5f distrib/i386/Makefile
--- a/distrib/i386/Makefile     Sun Jul 19 09:26:50 2015 +0000
+++ b/distrib/i386/Makefile     Sun Jul 19 10:16:55 2015 +0000
@@ -1,11 +1,15 @@
-#      $NetBSD: Makefile,v 1.10 2013/07/16 02:10:43 khorben Exp $
+#      $NetBSD: Makefile,v 1.11 2015/07/19 10:16:55 martin Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR=
 SUBDIR+=       ramdisks
 SUBDIR+=       .WAIT
 SUBDIR+=       instkernel
+.if ${MKKMOD} != "no"
 SUBDIR+=       kmod
 SUBDIR+=       kmod-cgdroot
+.endif
 SUBDIR+=       .WAIT
 SUBDIR+=       cdroms
 SUBDIR+=       floppies
diff -r 8aea27bfa3e4 -r aed10f09fe5f distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Sun Jul 19 09:26:50 2015 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Sun Jul 19 10:16:55 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.39 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.40 2015/07/19 10:16:55 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,10 @@
 CDINSTKERNEL=  ../../instkernel
 CDKERNELS=     netbsd-GENERIC.gz       netbsd
 CDRELEASE_NOISOS=      true
-CD_SETS=       base etc modules
+CD_SETS=       base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=      modules
+.endif
 
 image_md_pre:
        ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
diff -r 8aea27bfa3e4 -r aed10f09fe5f distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Sun Jul 19 09:26:50 2015 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Sun Jul 19 10:16:55 2015 +0000
@@ -1,11 +1,14 @@
-#      $NetBSD: Makefile,v 1.26 2015/05/28 09:51:31 martin Exp $
+#      $NetBSD: Makefile,v 1.27 2015/07/19 10:16:56 martin Exp $
+
+.include <bsd.own.mk>
+
 CDBASE=                sparc64cd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz        netbsd
-CD_SETS=       base etc modules
-
-# for PRINTOBJDIR
-.include <bsd.own.mk>
+CD_SETS=       base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=      modules
+.endif
 
 SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}