[src/netbsd-1-5]: src/distrib/x68k/floppies/bootfloppy-common Pull up revisio...

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

details:   https://anonhg.NetBSD.org/src/rev/e31b7b7bef3c
branches:  netbsd-1-5
changeset: 490398:e31b7b7bef3c
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 05:31:44 2000 +0000

description:
Pull up revision 1.16 (requested by minoura):
  Reorganize installation system by removing the old script based
  installer, provided for 4M systems.  Instead we provide
  ``floppy-root'' 2-floppy installer.

diffstat:

 distrib/x68k/floppies/bootfloppy-common/Makefile.inc |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 10289a878aa7 -r e31b7b7bef3c distrib/x68k/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/x68k/floppies/bootfloppy-common/Makefile.inc      Fri Dec 15 05:30:42 2000 +0000
+++ b/distrib/x68k/floppies/bootfloppy-common/Makefile.inc      Fri Dec 15 05:31:44 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.15 2000/06/18 10:33:18 minoura Exp $
+#      $NetBSD: Makefile.inc,v 1.15.2.1 2000/12/15 05:31:44 he Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -20,7 +20,9 @@
 MDEC=          ${DESTDIR}/usr/mdec
 
 LISTS=         ${COMMONDIR}/list
+.if ${RAMDISKDIR} != ""
 RAMDISK        !=cd ${RAMDISKDIR}; ${MAKE} echoimage
+.endif
 
 DISKTYPE=      floppy5
 
@@ -55,11 +57,16 @@
        -vnconfig -u ${VND_DEV}
        -/bin/rm -f ${IMAGE}
 
+.if defined(RAMDISK)
 ${KERNNAME}: ${KERN} ${RAMDISK}
        -/bin/rm -f netbsd.tmp*
        cp ${KERN} netbsd.tmp
        mdsetimage -v netbsd.tmp ${RAMDISK}
        mv -f netbsd.tmp ${.TARGET}
+.else
+${KERNNAME}: ${KERN}
+       cp ${KERN} ${.TARGET}
+.endif
 
 ${GZNAME}: ${KERNNAME}
        gzip -cv9 ${KERNNAME} > ${.TARGET}
@@ -71,8 +78,10 @@
        -mkdir -p ${RELEASEDIR}/installation/misc
        cp -p ${IMAGE} ${RELEASEDIR}/installation/floppy
        gzip <${IMAGE} >${RELEASEDIR}/installation/floppy/${IMAGE}.gz
+.ifndef NOKERNCOPY
        cp -p ${KERNNAME} ${RELEASEDIR}/installation/misc
        cp -p ${GZNAME} ${RELEASEDIR}/installation/misc
+.endif
 
 clean cleandir distclean:
        /bin/rm -f *.core ${IMAGE} ${CLEANFILES}