correct LINKS usage

7 files changed, 21 insertions, 23 deletions

diff --git a/lib/libl/Makefile b/lib/libl/Makefile
index 5823b0f609d..3d62f551b2c 100644
--- a/lib/libl/Makefile
+++ b/lib/libl/Makefile
@@ -4,11 +4,11 @@ LIB=	l
 SRCS=	libmain.c libyywrap.c
 NOPIC=
 
-LINKS=	/usr/lib/libl.a /usr/lib/libfl.a
+LINKS=	${LIBDIR}/libl.a ${LIBDIR}/libfl.a
 
 .PATH:	${.CURDIR}/../../usr.bin/lex
 .include <bsd.lib.mk>
 
 .if !defined(NOPROFILE)
-LINKS+=	/usr/lib/libl_p.a /usr/lib/libfl_p.a
+LINKS+=	${LIBDIR}/libl_p.a ${LIBDIR}/libfl_p.a
 .endif
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index 32bfb0587e7..8ded3127860 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -1,5 +1,5 @@
 #  $NetBSD: Makefile,v 1.28 1995/11/20 22:06:19 jtc Exp $
-#  $OpenBSD: Makefile,v 1.8 1996/10/27 19:57:45 downsj Exp $
+#  $OpenBSD: Makefile,v 1.9 1996/11/14 15:04:49 mickey Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24 
 # 
@@ -136,14 +136,14 @@ MAN+=	acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \
 	tan.3 tanh.3
 
 .if (${MACHINE_ARCH} == "i386")
-LINKS=	/usr/lib/libm.a /usr/lib/libm_i387.a
+LINKS=	${LIBDIR}/libm.a ${LIBDIR}/libm_i387.a
 .if !defined(NOPROFILE)
-LINKS+=	/usr/lib/libm_p.a /usr/lib/libm_i387_p.a
+LINKS+=	${LIBDIR}/libm_p.a ${LIBDIR}/libm_i387_p.a
 .endif
 .if !defined(NOPIC)
-LINKS+= /usr/lib/libm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-	/usr/lib/libm_i387.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-LINKS+= /usr/lib/libm_pic.a /usr/lib/libm_i387_pic.a
+LINKS+= ${LIBDIR}/libm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	${LIBDIR}/libm_i387.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+LINKS+= ${LIBDIR}/libm_pic.a ${LIBDIR}/libm_i387_pic.a
 .endif
 .endif
 
diff --git a/usr.bin/elf2olf/Makefile b/usr.bin/elf2olf/Makefile
index 933ae4cf1a9..7f8fb7ad8a1 100644
--- a/usr.bin/elf2olf/Makefile
+++ b/usr.bin/elf2olf/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 1996/11/14 14:21:25 mickey Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/11/14 15:04:50 mickey Exp $
 
 PROG=	elf2olf
 CPPFLAGS+= -DOS_ID=OOS_OPENBSD
-LINKS=	elf2olf olf2olf
+LINKS=	${BINDIR}/elf2olf ${BINDIR}/olf2olf
 NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/skey/Makefile b/usr.bin/skey/Makefile
index 42aea2907e7..6d8e53748d6 100644
--- a/usr.bin/skey/Makefile
+++ b/usr.bin/skey/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 1996/09/29 23:04:58 millert Exp $
+# $OpenBSD: Makefile,v 1.7 1996/11/14 15:04:50 mickey Exp $
 
 PROG=	skey
 MAN=	skey.1 skeyinfo.1 skeyaudit.1 skeyprune.8
-LINKS=	/usr/bin/skey /usr/bin/otp-md4 \
-	/usr/bin/skey /usr/bin/otp-md5 \
-	/usr/bin/skey /usr/bin/otp-sha1
+LINKS=	${BINDIR}/skey ${BINDIR}/otp-md4 \
+	${BINDIR}/skey ${BINDIR}/otp-md5 \
+	${BINDIR}/skey ${BINDIR}/otp-sha1
 MLINKS=	skey.1 otp-md4.1 \
 	skey.1 otp-md5.1 \
 	skey.1 otp-sha1.1
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 6ce957a7f89..9feedc09739 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1996/04/29 13:08:39 hvozda Exp $
+# $Id: Makefile,v 1.2 1996/11/14 15:04:51 mickey Exp $
 
 SRCS=	apm.c apmsubr.c
 #LDADD+=	-lutil
@@ -8,8 +8,7 @@ SRCS=	apm.c apmsubr.c
 CFLAGS+=	-g  -O2 -Wmissing-prototypes -Wall -I${.CURDIR}/../apmd
 PROG=	apm
 MAN=	apm.8
-MLINKS=         apm.8 zzz.8
-LINKS=          ${BINDIR}/apm ${BINDIR}/zzz
+MLINKS=	apm.8 zzz.8
+LINKS=	${BINDIR}/apm ${BINDIR}/zzz
 
 .include <bsd.prog.mk>
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 9df99b17b05..5ddbaf35f65 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.1 1995/10/18 08:47:29 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/11/14 15:04:52 mickey Exp $
 
 PROG=	chown
 CFLAGS+=-DSUPPORT_DOT
 MAN=	chgrp.1 chown.8
-LINKS=	${BINDIR}/chown /usr/bin/chgrp
+LINKS=	${BINDIR}/chown ${BINDIR}/chgrp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 027d9bfcdb9..1c434dc7556 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1996/09/19 09:05:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 1996/11/14 15:04:52 mickey Exp $
 #
 #  OpenBSD Makefile
 #
@@ -30,8 +30,7 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	srvrsmtp.c stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
 MAN=	aliases.5 mailstats.8 mailq.1 newaliases.1 sendmail.8
-LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
-	/usr/sbin/sendmail /usr/bin/mailq
+LINKS=	${BINDIR}/sendmail ${BINDIR}/newaliases ${BINDIR}/sendmail ${BINDIR}/mailq
 INSTALL=install
 BINDIR=	/usr/sbin
 BINOWN=	root