diff options
| author | peter <peter@FreeBSD.org> | 1997-09-05 09:09:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-09-05 09:09:56 +0000 |
| commit | e74698834ad418551451a459495c73fb6c0edeb5 (patch) | |
| tree | a1c2e51aeb96eb4b8069600faaa54d15ce60bc26 /share/mk | |
| parent | 1428bb8823428b5a4d0e90a03297865a44388dba (diff) | |
| download | FreeBSD-src-e74698834ad418551451a459495c73fb6c0edeb5.zip FreeBSD-src-e74698834ad418551451a459495c73fb6c0edeb5.tar.gz | |
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.
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 5 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 5 | ||||
| -rw-r--r-- | 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 0d3cbbc..1e82779 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 805ab54..1497b1b 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 bd145c1..946fa86 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 # |
