diff options
author | jb <jb@FreeBSD.org> | 1998-08-30 02:52:04 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 1998-08-30 02:52:04 +0000 |
commit | 2b6505f997aac707339144a237f95039594d39d4 (patch) | |
tree | c66d25bb4948a86d58614cb64bcc6f305e9d7ece /lib | |
parent | 13a816f577a2a4b0841386bc9d437971f706a097 (diff) | |
download | FreeBSD-src-2b6505f997aac707339144a237f95039594d39d4.zip FreeBSD-src-2b6505f997aac707339144a237f95039594d39d4.tar.gz |
BINFORMAT -> OBJFORMAT ready for E-day.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libcrypt/Makefile | 6 | ||||
-rw-r--r-- | lib/libtermcap/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 36bf6e8..1ad2b9a 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,11 +1,11 @@ # -# $Id: Makefile,v 1.11 1998/05/28 12:52:03 peter Exp $ +# $Id: Makefile,v 1.12 1998/08/30 01:48:55 jb Exp $ # LCRYPTBASE= libcrypt LSCRYPTBASE= libscrypt -.if ${BINFORMAT} != elf +.if ${OBJFORMAT} != elf LCRYPTSO= ${LCRYPTBASE}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} LSCRYPTSO= ${LSCRYPTBASE}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .else @@ -34,7 +34,7 @@ afterinstall: ln -s ${LSCRYPTSO} ${LCRYPTSO}; \ fi .endif -.if !defined(NOPIC) && ${BINFORMAT} == elf +.if !defined(NOPIC) && ${OBJFORMAT} == elf @cd ${DESTDIR}${LIBDIR}; \ if [ ! -e ${LCRYPTBASE}.so ]; then \ rm -f ${LCRYPTBASE}.so; \ diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile index 044965f..23aa8eb 100644 --- a/lib/libtermcap/Makefile +++ b/lib/libtermcap/Makefile @@ -13,7 +13,7 @@ MLINKS= termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \ LINKS= ${LIBDIR}/libtermcap.a ${LIBDIR}/libtermlib.a .if !defined(NOPIC) -.if ${BINFORMAT} == aout +.if ${OBJFORMAT} == aout LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ${SHLIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .else @@ -30,7 +30,7 @@ beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.h \ ${DESTDIR}/usr/include -.if ${BINFORMAT} == aout +.if ${OBJFORMAT} == aout # This is a hack.. Work around a major number bump that should have been # done differently. Back out this delta when it's time to go to 3.0 for real. .if !defined(NOPIC) |