summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/rcp/Makefile2
-rw-r--r--libexec/rlogind/Makefile4
-rw-r--r--libexec/rshd/Makefile4
-rw-r--r--sbin/dump/Makefile3
-rw-r--r--sbin/restore/Makefile3
-rw-r--r--usr.bin/login/Makefile2
-rw-r--r--usr.bin/passwd/Makefile4
-rw-r--r--usr.bin/rlogin/Makefile3
-rw-r--r--usr.bin/rsh/Makefile3
-rw-r--r--usr.bin/su/Makefile2
10 files changed, 17 insertions, 13 deletions
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index f6db9bc..f604da7 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -5,7 +5,7 @@ PROG= rcp
SRCS= rcp.c util.c
CFLAGS+=-Wall
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c
DPADD= ${LIBKRB} ${LIBDES}
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index c12984f..aebc421 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.7 1997/02/22 14:22:07 peter Exp $
+# $Id$
PROG= rlogind
SRCS= rlogind.c
@@ -8,7 +8,7 @@ DPADD= ${LIBUTIL}
LDADD= -lutil
CFLAGS+= -Wall
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
SRCS+= encrypt.c
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-I${.CURDIR}/../../kerberosIV/include \
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index cb23d4c..bcae68e 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,11 +1,11 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.7 1997/04/23 03:06:47 davidn Exp $
+# $Id$
PROG= rshd
SRCS= rshd.c
MAN8= rshd.8
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
CFLAGS+=-DKERBEROS -DCRYPT
DPADD= ${LIBKRB} ${LIBDES}
LDADD= -lkrb -ldes
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 8a91697..a89e2c9 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,4 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+# $Id$
# dump.h header file
# itime.c reads /etc/dumpdates
@@ -22,7 +23,7 @@ BINMODE=2555
MAN8= dump.8
MLINKS+=dump.8 rdump.8
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd
SRCS+= krcmd.c kcmd.c rcmd_util.c
LDADD+= -lkrb -ldes
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 0b6ea61..2f6a99c 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,4 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+# $Id$
PROG= restore
LINKS= ${BINDIR}/restore ${BINDIR}/rrestore
@@ -12,7 +13,7 @@ MAN8= restore.8
MLINKS+=restore.8 rrestore.8
.PATH: ${.CURDIR}/../dump
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd
SRCS+= krcmd.c kcmd.c rcmd_util.c
LDADD+= -lkrb -ldes
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 6bbe886..4c7615a 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -18,7 +18,7 @@ CFLAGS+=-DKLOGIN_PARANOID
DPADD= ${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
LDADD= -lutil -lskey -lmd -lcrypt
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
CFLAGS+=-DKERBEROS
SRCS+= klogin.c
DPADD+= ${LIBKRB} ${LIBDES}
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 117be93..4909e57 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.27 1998/03/06 14:02:04 bde Exp $
+# $Id$
PROG= passwd
SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
@@ -55,7 +55,7 @@ MAN1=passwd.1
LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
MLINKS=passwd.1 yppasswd.1
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS4))
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && (defined(MAKE_KERBEROS4))
SRCS+= kpasswd_standalone.c
.PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 746e4a4..e3d594c 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,4 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
+# $Id$
PROG= rlogin
SRCS= rlogin.c
@@ -8,7 +9,7 @@ BINOWN= root
BINMODE=4555
INSTALLFLAGS=-fschg
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c
DPADD= ${LIBKRB} ${LIBDES}
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index e01c80d..4f5f0c3 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,10 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
+# $Id$
PROG= rsh
SRCS= rsh.c
CFLAGS+=-Wall
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-I${.CURDIR}/../rlogin -I${.CURDIR} -I- \
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index ff98997..e468065 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -19,7 +19,7 @@ COPTS+= -DWHEELSU
.endif
CFLAGS+= -Wall
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) \
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) \
&& !defined(LC_AUTH)
CFLAGS+=-DKERBEROS
DPADD+= ${LIBKRB} ${LIBDES}
OpenPOWER on IntegriCloud