d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the BINFORMAT definitions so that they do not depend on sys.mk,

Browse Source 
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.
This commit is contained in:
Peter Wemm 1997-09-05 09:09:56 +00:00
parent 279a69322c
commit 3ec75cc6df
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/mk/bsd.lib.mk
View File

@ -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

5
share/mk/bsd.prog.mk
View File

@ -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}

5
share/mk/sys.mk
View File

@ -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
#