diff options
| author | bde <bde@FreeBSD.org> | 1998-12-30 10:21:37 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-12-30 10:21:37 +0000 |
| commit | 8bdaca54d8795b041b85044be1b3981fe3425b33 (patch) | |
| tree | 69a01f2ad8cd124f0bfb5d8fb20e61dbe99b6f6a /sys/i386/boot/biosboot/Makefile | |
| parent | 7b1084f205e002921467ef8247d4ca24370b8013 (diff) | |
| download | FreeBSD-src-8bdaca54d8795b041b85044be1b3981fe3425b33.zip FreeBSD-src-8bdaca54d8795b041b85044be1b3981fe3425b33.tar.gz | |
Rely on ../Makefile.inc to set the object format in CFLAGS and the
default for BINDIR. The default BINDIR of /usr/mdec can't be overridden
yet because libdisk still uses /usr/mdec and installing in /boot might
clobber the new boot blocks.
Don't install links to bootxx or xxboot.
Install boot1 and boot2 in 1 step.
Don't delete the boot.help source file on installing it when ${COPY} is
null.
Diffstat (limited to 'sys/i386/boot/biosboot/Makefile')
| -rw-r--r-- | sys/i386/boot/biosboot/Makefile | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index 17ebe1b..e4feaf9 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.66 1998/09/23 06:50:45 yokota Exp $ +# $Id: Makefile,v 1.67 1998/11/21 21:07:17 ache Exp $ # PROG= boot @@ -6,9 +6,8 @@ PROG= boot SRCS= start.S table.c boot2.S boot.c asm.S bios.S serial.S SRCS+= probe_keyboard.c io.c disk.c sys.c -BINDIR= /usr/mdec BINMODE= 444 -CFLAGS= -aout -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \ +CFLAGS= -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \ -mno-486 \ -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} @@ -82,19 +81,11 @@ boot2: boot.nohdr all: boot1 boot2 install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\ - boot1 ${DESTDIR}${BINDIR}/boot1 - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\ - boot2 ${DESTDIR}${BINDIR}/boot2 - for i in da fd wd od vn wfd ; do \ - ( cd ${DESTDIR}${BINDIR} ; \ - rm -f boot$${i} $${i}boot ; \ - ln -s boot1 $${i}boot ; \ - ln -s boot2 boot$${i} ; ) \ - done + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + boot1 boot2 ${DESTDIR}${BINDIR}/ install-boothelp: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/boot.help ${DESTDIR}/ .include <bsd.kern.mk> |
