From 576896857da699d4f177fec1fd895f9728b33100 Mon Sep 17 00:00:00 2001 From: jym Date: Tue, 8 Feb 2011 12:25:36 +0000 Subject: [PATCH] FLOPPYPAD + ${MACHINE} instead of hardcoding amd64. --- distrib/amd64/floppies/common/Makefile.bootfloppy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/distrib/amd64/floppies/common/Makefile.bootfloppy b/distrib/amd64/floppies/common/Makefile.bootfloppy index e3315caf1712..97b5ab0e66e8 100644 --- a/distrib/amd64/floppies/common/Makefile.bootfloppy +++ b/distrib/amd64/floppies/common/Makefile.bootfloppy @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootfloppy,v 1.10 2008/11/04 23:02:52 dbj Exp $ +# $NetBSD: Makefile.bootfloppy,v 1.11 2011/02/08 12:25:36 jym Exp $ # # Makefile snippet to create a set of USTAR floppies # @@ -31,9 +31,10 @@ FLOPPYINSTBOOT= "${TOOL_INSTALLBOOT} ${FLOPPYBOOTOPTIONS} -m${MACHINE} @IMAGE@ FLOPPYKERNOBJ!= cd ${.CURDIR}/../../${FLOPPYKERNDIR} && ${PRINTOBJDIR} FLOPPY_BOOT?= ${MDEC}/boot -FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/amd64/floppies/common/boot.cfg +FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/${MACHINE}/floppies/common/boot.cfg FLOPPY_NETBSD= ${FLOPPYKERNOBJ}/${FLOPPYKERNEL} FLOPPYFILES= boot boot.cfg ${FLOPPYMETAFILE} netbsd +FLOPPYPAD= 1 FLOPPY_RELEASEDIR= installation/floppy