CVS commit: [netbsd-6] src

["Jeff Rizzo" <riz%netbsd.org@localhost>]

Module Name:    src
Committed By:   riz
Date:           Tue Jun 12 19:11:51 UTC 2012

Modified Files:
        src/sbin/fdisk [netbsd-6]: Makefile fdisk.c
        src/tools/fdisk [netbsd-6]: Makefile

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #315):
        sbin/fdisk/fdisk.c: revision 1.141
        sbin/fdisk/fdisk.c: revision 1.142
        tools/fdisk/Makefile: revision 1.5
        tools/fdisk/Makefile: revision 1.7
        sbin/fdisk/Makefile: revision 1.42
Don't use "#if defined(__i386__) || defined(__x86_64__)" conditionals
in C source file to define option features.
Define proper options in each Makefile per ${MACHINE_ARCH} variable instead.
Previously if a host is x86 and it has /usr/mdec/mbr file in its system,
tools fdisk implicitly installs it as mbr bootcode even for !x86 targets.
Use ${DESTDIR}/usr/mdec for DEFAULT_BOOTDIR on tools fdisk(8)
rather than unknown build host's /usr/mdec directory.
XXX: no option to leave MBR bootcode empty on x86 targets


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.8.1 src/sbin/fdisk/Makefile
cvs rdiff -u -r1.138 -r1.138.2.1 src/sbin/fdisk/fdisk.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/tools/fdisk/Makefile

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