diff options
| author | bde <bde@FreeBSD.org> | 1998-12-30 12:06:08 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-12-30 12:06:08 +0000 |
| commit | c7d467927626147e8d643da13bfc62848f70f5de (patch) | |
| tree | c58942e6d3159932215c56d7760b9563cad5eead | |
| parent | 64edc80b7a347c25a3d3bdaefc15aedb895fc913 (diff) | |
| download | FreeBSD-src-c7d467927626147e8d643da13bfc62848f70f5de.zip FreeBSD-src-c7d467927626147e8d643da13bfc62848f70f5de.tar.gz | |
Backed out previous commit. It depends on a.out utilities and libraries
somehow being available even on pure elf systems.
| -rw-r--r-- | Makefile.inc1 | 9 | ||||
| -rw-r--r-- | lib/libdisk/Makefile | 4 | ||||
| -rw-r--r-- | sys/Makefile | 18 |
3 files changed, 15 insertions, 16 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8b501eb..b0ddc749 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc1,v 1.51 1998/12/28 17:03:50 peter Exp $ +# $Id: Makefile.inc1,v 1.52 1998/12/30 11:26:24 bde Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -677,11 +677,6 @@ _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}. @@ -721,7 +716,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 ${_biosboot} \ + lib/libradius lib/libskey lib/libtacplus \ ${_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 549333b..297a328 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.21 1998/10/06 11:57:08 dfr Exp $ +# $Id: Makefile,v 1.22 1998/12/30 11:26:24 bde 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= ${DESTDIR}/usr/mdec +BOOTS=/usr/mdec .if ${MACHINE_ARCH} == "i386" data.c: ${.CURDIR}/libdisk.h ${BOOTS}/boot1 ${BOOTS}/boot2 diff --git a/sys/Makefile b/sys/Makefile index e13a51a..bca5ede 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,15 +1,19 @@ -# $Id: Makefile,v 1.14 1998/11/03 06:50:58 peter Exp $ +# $Id: Makefile,v 1.15 1998/12/30 11:17:09 bde Exp $ -SUBDIR= modules - -.if ${MACHINE_ARCH} == "alpha" || ${OBJFORMAT} == "elf" -SUBDIR+=boot +# This is the old aout only boot loader. +.if exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout" +SUBDIR= ${MACHINE}/boot +.elif exists(boot) && ${MACHINE} == "i386" && ${OBJFORMAT} == "elf" +SUBDIR= boot .endif -.if exists(${.CURDIR}/${MACHINE}/boot) -SUBDIR+=${MACHINE}/boot +.if exists(boot) && ${MACHINE_ARCH} == "alpha" +SUBDIR= boot .endif +# KLD modules build for both a.out and ELF +SUBDIR+=modules + HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include <bsd.subdir.mk> |
