diff options
| -rw-r--r-- | lib/libcrypt/Makefile | 6 | ||||
| -rw-r--r-- | lib/libtermcap/Makefile | 4 | ||||
| -rw-r--r-- | release/Makefile | 8 | ||||
| -rwxr-xr-x | release/scripts/proflibs-make.sh | 4 | ||||
| -rw-r--r-- | usr.bin/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/su/Makefile | 2 |
6 files changed, 14 insertions, 14 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) diff --git a/release/Makefile b/release/Makefile index 5279cf7..46ffb5d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.368 1998/08/16 01:24:40 jkh Exp $ +# $Id: Makefile,v 1.369 1998/08/23 00:52:18 gpalmer Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -33,7 +33,7 @@ RELEASEDOCMODULE?= doc RELEASEPORTSMODULE?= ports # Unless set elsewhere, indicate the object format we'll be using. -BINFORMAT?= aout +OBJFORMAT?= aout # Uncomment this to disable the doc.1 target. It is also an ERROR # to set NOPORTS and not set NODOC since docs depend on ports. @@ -350,7 +350,7 @@ release.5: @for i in ${DISTRIBUTIONS}; do \ if [ -f ${.CURDIR}/scripts/$${i}-make.sh ]; then \ echo -n "Running $$i dist creation script... "; \ - env BINFORMAT=${BINFORMAT} RD=${RD} sh ${.CURDIR}/scripts/$${i}-make.sh || echo "$$i distribution script returned bad status."; \ + env OBJFORMAT=${OBJFORMAT} RD=${RD} sh ${.CURDIR}/scripts/$${i}-make.sh || echo "$$i distribution script returned bad status."; \ echo "Done."; \ fi \ done \ @@ -358,7 +358,7 @@ release.5: # Create symlinks for the MD5-based crypt lib, too. The # automatically created links still point to the DES stuff, # which went into its own distribution. - for i in ${RD}/trees/bin/usr/lib/${BINFORMAT}/libscrypt* ; do \ + for i in ${RD}/trees/bin/usr/lib/${OBJFORMAT}/libscrypt* ; do \ c=`echo $$i | sed -e 's/libscrypt/libcrypt/'` ; \ rm -f $$c ; \ ln -s `basename $$i` $$c ; \ diff --git a/release/scripts/proflibs-make.sh b/release/scripts/proflibs-make.sh index b7da8ab..19bd15c 100755 --- a/release/scripts/proflibs-make.sh +++ b/release/scripts/proflibs-make.sh @@ -1,8 +1,8 @@ #!/bin/sh # Move the profiled libraries out to their own dist -for i in ${RD}/trees/bin/usr/lib/${BINFORMAT}/*_p.a; do +for i in ${RD}/trees/bin/usr/lib/${OBJFORMAT}/*_p.a; do if [ -f $i ]; then - mv $i ${RD}/trees/proflibs/usr/lib/${BINFORMAT}; + mv $i ${RD}/trees/proflibs/usr/lib/${OBJFORMAT}; fi; done diff --git a/usr.bin/Makefile b/usr.bin/Makefile index e007ed4..222b09d 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $Id: Makefile,v 1.106 1998/08/26 10:03:28 gpalmer Exp $ +# $Id: Makefile,v 1.107 1998/08/26 12:41:11 gpalmer Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -37,7 +37,7 @@ SUBDIR+=telnet # Things that don't compile on alpha or are aout specific: SUBDIR+=ar brandelf dig dnsquery fstat gcore gprof gprof4 host \ ldd modstat mt nm ranlib sasc size strings strip systat truss vmstat -.if ${BINFORMAT} == aout +.if ${OBJFORMAT} == aout SUBDIR+=doscmd .endif .endif diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index e468065..5f64717 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -28,7 +28,7 @@ DISTRIBUTION= krb .endif # Do we have to provide an implementation for libskey.so? -.if ${BINFORMAT} != elf +.if ${OBJFORMAT} != elf LDADD+= -lmd DPADD+= ${LIBMD} .endif |
