diff options
| author | bde <bde@FreeBSD.org> | 1998-12-30 11:26:24 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-12-30 11:26:24 +0000 |
| commit | 64edc80b7a347c25a3d3bdaefc15aedb895fc913 (patch) | |
| tree | 666a79a41ca5daef0308951a6125730d99bc160d | |
| parent | 5a321038595ca1b0d81c06c484bcc39dfe19adb9 (diff) | |
| download | FreeBSD-src-64edc80b7a347c25a3d3bdaefc15aedb895fc913.zip FreeBSD-src-64edc80b7a347c25a3d3bdaefc15aedb895fc913.tar.gz | |
Fixed bootstrapping of /usr/mdec/boot[12].
| -rw-r--r-- | Makefile.inc1 | 9 | ||||
| -rw-r--r-- | lib/libdisk/Makefile | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index bb4332b..8b501eb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc1,v 1.50 1998/12/27 21:11:07 phk Exp $ +# $Id: Makefile.inc1,v 1.51 1998/12/28 17:03:50 peter Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -677,6 +677,11 @@ _libm= lib/msun _libperl= gnu/usr.bin/perl/libperl .endif +# biosboot is not a library, but must be built before libdisk. +.if exists(sys/${MACHINE}/boot/biosboot) +_biosboot= sys/${MACHINE}/boot/biosboot +.endif + # # bootstrap-libraries - build just enough libraries for the bootstrap # tools, and install them under ${WORLDTMP}. @@ -716,7 +721,7 @@ bootstrap-libraries: libraries: .for _lib in ${_csu} lib/libcom_err ${_libcrypt} ${_libm} lib/libmd \ lib/libmytinfo lib/libncurses lib/libtermcap \ - lib/libradius lib/libskey lib/libtacplus \ + lib/libradius lib/libskey lib/libtacplus ${_biosboot} \ ${_secure_lib} ${_kerberosIV_lib} \ gnu/lib gnu/usr.bin/cc/libgcc ${_libperl} lib usr.bin/lex/lib .if exists(${.CURDIR}/${_lib}) diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile index 1b1200d..549333b 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 1997/02/22 15:06:25 peter Exp $ +# $Id: Makefile,v 1.21 1998/10/06 11:57:08 dfr Exp $ LIB= disk SRCS= blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \ @@ -42,7 +42,7 @@ MLINKS+= libdisk.3 Open_Disk.3 \ .include <bsd.lib.mk> -BOOTS=/usr/mdec +BOOTS= ${DESTDIR}/usr/mdec .if ${MACHINE_ARCH} == "i386" data.c: ${.CURDIR}/libdisk.h ${BOOTS}/boot1 ${BOOTS}/boot2 |
