From 3ec75cc6df1ac0aa0ada6a8b5c23d7cefdb3ebda Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 5 Sep 1997 09:09:56 +0000
Subject: [PATCH] Change the BINFORMAT definitions so that they do not depend
 on sys.mk, since 2.1.x make(1) apparently does not have the -m switch to set
 both the the bsd.*.mk and sys.mk location, and this breaks 'make world' from
 a 2.1.x system.

---
 share/mk/bsd.lib.mk  | 5 ++++-
 share/mk/bsd.prog.mk | 5 ++++-
 share/mk/sys.mk      | 5 +----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 0d3cbbc45cc..1e82779d844 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,11 +1,14 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.60 1997/08/05 03:49:48 asami Exp $
+#	$Id: bsd.lib.mk,v 1.61 1997/08/30 23:23:13 peter Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+# Default executable format
+BINFORMAT?=	aout
+
 .if exists(${.CURDIR}/shlib_version)
 SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
 .if ${BINFORMAT} == aout
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 805ab5443ed..1497b1bacce 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,10 +1,13 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.54 1997/08/05 03:49:49 asami Exp $
+#	$Id: bsd.prog.mk,v 1.55 1997/08/30 23:23:17 peter Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+# Default executable format
+BINFORMAT?=	aout
+
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
 CFLAGS+=${COPTS} ${DEBUG_FLAGS}
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index bd145c1c095..946fa867075 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-#	$Id: sys.mk,v 1.23 1997/04/13 06:44:25 jkh Exp $
+#	$Id: sys.mk,v 1.24 1997/08/30 23:23:18 peter Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 
@@ -98,9 +98,6 @@ YFLAGS		?=	-d
 GTAGSFLAGS=	-se
 HTAGSFLAGS=
 
-# Binary file format
-BINFORMAT?=	aout
-
 .if defined(%POSIX)
 # Posix 1003.2 mandated rules
 #