Module Name:	basesrc
Committed By:	lukem
Date:		Mon Oct 14 16:20:42 UTC 2002

Modified Files:
	basesrc/distrib/i386/floppies: Makefile
	basesrc/distrib/i386/floppies/bootfloppy: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-big: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-com: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-laptop: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-ps2: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-small: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-tiny: Makefile
	basesrc/distrib/i386/floppies/common: Makefile.bootfloppy
	basesrc/distrib/i386/floppies/rescue-small: Makefile
	basesrc/distrib/i386/floppies/rescue-tiny: Makefile
Added Files:
	basesrc/distrib/i386/floppies/instkernel: Makefile
Removed Files:
	basesrc/distrib/i386/floppies/kernel-ramdisk: Makefile
	basesrc/distrib/i386/floppies/kernel-rescue: Makefile

Log Message:
Merge kernel-ramdisk & kernel-rescue into instkernel, now that
../../common/Makefile.mdset supports building multiple copies of the
same kernel (as long as they're to separate filenames).
Now there's no need to set FLOPPYKERNDIR, as it now defaults to instkernel.


To generate a diff of this commit:
cvs rdiff -r1.29 -r1.30 basesrc/distrib/i386/floppies/Makefile
cvs rdiff -r1.8 -r1.9 basesrc/distrib/i386/floppies/bootfloppy/Makefile
cvs rdiff -r1.19 -r1.20 basesrc/distrib/i386/floppies/bootfloppy-big/Makefile
cvs rdiff -r1.2 -r1.3 basesrc/distrib/i386/floppies/bootfloppy-com/Makefile
cvs rdiff -r1.1 -r1.2 \
    basesrc/distrib/i386/floppies/bootfloppy-laptop/Makefile
cvs rdiff -r1.7 -r1.8 basesrc/distrib/i386/floppies/bootfloppy-ps2/Makefile
cvs rdiff -r1.14 -r1.15 \
    basesrc/distrib/i386/floppies/bootfloppy-small/Makefile
cvs rdiff -r1.11 -r1.12 \
    basesrc/distrib/i386/floppies/bootfloppy-tiny/Makefile
cvs rdiff -r1.12 -r1.13 \
    basesrc/distrib/i386/floppies/common/Makefile.bootfloppy
cvs rdiff -r0 -r1.1 basesrc/distrib/i386/floppies/instkernel/Makefile
cvs rdiff -r1.22 -r0 basesrc/distrib/i386/floppies/kernel-ramdisk/Makefile
cvs rdiff -r1.18 -r0 basesrc/distrib/i386/floppies/kernel-rescue/Makefile
cvs rdiff -r1.9 -r1.10 basesrc/distrib/i386/floppies/rescue-small/Makefile
cvs rdiff -r1.10 -r1.11 basesrc/distrib/i386/floppies/rescue-tiny/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.