[src/trunk]: src/distrib/i386/floppies always set FLOPPYMETAFILE if FLOPPYSIZ...

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

details:   https://anonhg.NetBSD.org/src/rev/e915fa77b323
branches:  trunk
changeset: 526823:e915fa77b323
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun May 12 10:48:35 2002 +0000

description:
always set FLOPPYMETAFILE if FLOPPYSIZE!=2880

diffstat:

 distrib/i386/floppies/bootfloppy-big/Makefile    |  3 +--
 distrib/i386/floppies/common/Makefile.bootfloppy |  7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 86942cf0ea95 -r e915fa77b323 distrib/i386/floppies/bootfloppy-big/Makefile
--- a/distrib/i386/floppies/bootfloppy-big/Makefile     Sun May 12 09:47:06 2002 +0000
+++ b/distrib/i386/floppies/bootfloppy-big/Makefile     Sun May 12 10:48:35 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2002/04/16 09:06:49 lukem Exp $
+#      $NetBSD: Makefile,v 1.19 2002/05/12 10:48:35 lukem Exp $
 
 # This Makefile builds a boot image on a 2.88M-sized image.
 #
@@ -19,6 +19,5 @@
 FLOPPYPAD=     1
 FLOPPYKERNDIR= kernel-ramdisk
 FLOPPYKERNEL=  netbsd.INSTALL.gz
-FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
 
 .include "${.CURDIR}/../common/Makefile.bootfloppy"
diff -r 86942cf0ea95 -r e915fa77b323 distrib/i386/floppies/common/Makefile.bootfloppy
--- a/distrib/i386/floppies/common/Makefile.bootfloppy  Sun May 12 09:47:06 2002 +0000
+++ b/distrib/i386/floppies/common/Makefile.bootfloppy  Sun May 12 10:48:35 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootfloppy,v 1.11 2002/05/04 01:34:37 lukem Exp $
+#      $NetBSD: Makefile.bootfloppy,v 1.12 2002/05/12 10:48:35 lukem Exp $
 #
 # Makefile snippet to create a set of USTAR floppies
 #
@@ -18,6 +18,11 @@
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 FLOPPYSIZE?=           2880
+.if defined(FLOPPYSIZE) && (${FLOPPYSIZE} != 2880)
+FLOPPYMETAFILE!=       printf "USTAR.volsize.%o" ${FLOPPYSIZE}
+.else
+FLOPPYSIZE=    2880
+.endif
 FLOPPYSUFFIX?=         .fs
 MDEC=                  ${DESTDIR}/usr/mdec
 #      XXXDISTRIB: need MI installboot for i386