BINFORMAT -> OBJFORMAT ready for E-day.

3 files changed, 16 insertions, 16 deletions

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 7fdc914..1aa6a1e 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.76 1998/08/08 13:11:44 peter Exp $
+#	$Id: bsd.lib.mk,v 1.77 1998/08/08 13:22:06 peter Exp $
 #
 
 .if !target(__initialized__)
@@ -11,19 +11,19 @@ __initialized__:
 
 # Default executable format
 .if ${MACHINE} == "alpha"
-BINFORMAT?=	elf
+OBJFORMAT?=	elf
 .else
-BINFORMAT?=	aout
+OBJFORMAT?=	aout
 .endif
 
 .if exists(${.CURDIR}/shlib_version)
 SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
-.if ${BINFORMAT} == aout
+.if ${OBJFORMAT} == aout
 SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
 .endif
 .endif
 
-.if !defined(NOPIC) && ${BINFORMAT} == elf
+.if !defined(NOPIC) && ${OBJFORMAT} == elf
 SONAME?=	lib${LIB}.so.${SHLIB_MAJOR}
 .endif
 
@@ -40,7 +40,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 STRIP?=	-s
 .endif
 
-.if ${BINFORMAT} != aout || make(checkdpadd)
+.if ${OBJFORMAT} != aout || make(checkdpadd)
 .include <bsd.libnames.mk>
 .endif
 
@@ -153,7 +153,7 @@ _LIBS=lib${LIB}.a
 .endif
 
 .if !defined(NOPIC)
-.if ${BINFORMAT} == aout
+.if ${OBJFORMAT} == aout
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
@@ -197,7 +197,7 @@ LDDESTDIRENV?=	LIBRARY_PATH=${DESTDIR}${SHLIBDIR}:${DESTDIR}${LIBDIR}
 SOBJS+= ${OBJS:.o=.so}
 
 .if !defined(NOPIC)
-.if ${BINFORMAT} == aout
+.if ${OBJFORMAT} == aout
 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS}
 	@${ECHO} building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
 	@rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
@@ -240,7 +240,7 @@ _EXTRADEPEND:
 	    > $$TMP; \
 	mv $$TMP ${DEPENDFILE}
 .if !defined(NOEXTRADEPEND) && !defined(NOPIC)
-.if ${BINFORMAT} == aout
+.if ${OBJFORMAT} == aout
 	echo lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: \
 	    `${LDDESTDIRENV} ${CC} -shared -Wl,-f ${LDDESTDIR} ${LDADD}` \
 	    >> ${DEPENDFILE}
@@ -271,7 +271,7 @@ realinstall: beforeinstall
 .endif
 .endif
 .if !defined(NOPIC)
-.if ${BINFORMAT} == aout
+.if ${OBJFORMAT} == aout
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${INSTALLFLAGS} ${SHLINSTALLFLAGS} \
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 4e216bd..c6ce525 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.obj.mk,v 1.24 1998/05/06 18:44:03 bde Exp $
+#	$Id: bsd.obj.mk,v 1.25 1998/06/04 15:31:55 peter Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
@@ -136,7 +136,7 @@ clean: _SUBDIR
 checkdpadd: _SUBDIR
 .if (defined(DPADD) || defined(LDADD))
 checkdpadd:
-.if ${BINFORMAT} != aout
+.if ${OBJFORMAT} != aout
 	@ldadd=`echo \`for lib in ${DPADD} ; do \
 		echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \
 	done \`` ; \
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 9336988..67d899b 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.75 1998/06/05 18:38:54 dt Exp $
+#	$Id: bsd.prog.mk,v 1.76 1998/08/08 07:02:08 peter Exp $
 
 .if !target(__initialized__)
 __initialized__:
@@ -9,7 +9,7 @@ __initialized__:
 .endif
 
 # Default executable format
-BINFORMAT?=	aout
+OBJFORMAT?=	aout
 
 .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S
 
@@ -73,7 +73,7 @@ CLEANFILES+= ${PROG} ${OBJS}
 
 .if defined(PROG) && !defined(NOEXTRADEPEND)
 _EXTRADEPEND:
-.if ${BINFORMAT} == aout
+.if ${OBJFORMAT} == aout
 	echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} ${LDDESTDIR} \
 	    ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE}
 .else
@@ -158,7 +158,7 @@ all-man:
 regress:
 .endif
 
-.if ${BINFORMAT} != aout || make(checkdpadd)
+.if ${OBJFORMAT} != aout || make(checkdpadd)
 .include <bsd.libnames.mk>
 .endif