diff options
| author | obrien <obrien@FreeBSD.org> | 1999-03-29 10:59:53 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-03-29 10:59:53 +0000 |
| commit | 882ac90fcc58ca8d52bd217f76c0caf573054cbe (patch) | |
| tree | a1a08c75fd368c9ce08688ae781be90162a1d888 | |
| parent | e92e9c75bfcb1d32e9a6da832e0288caef0abd4a (diff) | |
| download | FreeBSD-src-882ac90fcc58ca8d52bd217f76c0caf573054cbe.zip FreeBSD-src-882ac90fcc58ca8d52bd217f76c0caf573054cbe.tar.gz | |
Change !defined(NOAOUT) knob to defined(WANT_AOUT).
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.inc0 | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.224 1999/02/17 20:56:09 msmith Exp $ +# $Id: Makefile,v 1.225 1999/03/20 20:10:19 jkh Exp $ # # The user-driven targets are: # @@ -52,7 +52,7 @@ # or 3.0. If OBJFORMAT is set as an environment variable or in /etc/make.conf, # this overrides /etc/objformat. # -# Unless -DNOAOUT is specified, a `make world' with OBJFORMAT=elf will +# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will # update the legacy support for aout. This includes all libraries, ld.so # and boot objects. This part of build should be regarded as # deprecated and you should _not_ expect to be able to do this past the diff --git a/Makefile.inc0 b/Makefile.inc0 index 7b82b88..008f1bd 100644 --- a/Makefile.inc0 +++ b/Makefile.inc0 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc0,v 1.13 1998/12/20 14:30:08 jhay Exp $ +# $Id: Makefile.inc0,v 1.14 1999/01/14 06:45:53 jhay Exp $ # # This makefile ensures that the object directory is set according to the # object format to avoid mixing aout and elf formatted files during the @@ -78,11 +78,11 @@ world: @cd ${.CURDIR}; ${MK_ENV} ${MAKE} pre-world .endif @cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld -.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT) +.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT) @cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build .endif @cd ${.CURDIR}; ${MK_ENV} ${MAKE} -B installworld -.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT) +.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT) @cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-install .endif .if target(post-world) @@ -105,7 +105,7 @@ world: # buildworld : @cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld -.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT) +.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT) @cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build .endif @@ -117,6 +117,6 @@ buildworld : # installworld : @cd ${.CURDIR}; ${MK_ENV} ${MAKE} installworld -.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT) +.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT) @cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} -DNOMAN -DNOINFO legacy-install .endif |
