summaryrefslogtreecommitdiffstats
path: root/Makefile.inc0
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1999-03-29 10:59:53 +0000
committerobrien <obrien@FreeBSD.org>1999-03-29 10:59:53 +0000
commit882ac90fcc58ca8d52bd217f76c0caf573054cbe (patch)
treea1a08c75fd368c9ce08688ae781be90162a1d888 /Makefile.inc0
parente92e9c75bfcb1d32e9a6da832e0288caef0abd4a (diff)
downloadFreeBSD-src-882ac90fcc58ca8d52bd217f76c0caf573054cbe.zip
FreeBSD-src-882ac90fcc58ca8d52bd217f76c0caf573054cbe.tar.gz
Change !defined(NOAOUT) knob to defined(WANT_AOUT).
Diffstat (limited to 'Makefile.inc0')
-rw-r--r--Makefile.inc010
1 files changed, 5 insertions, 5 deletions
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
OpenPOWER on IntegriCloud