diff options
| author | markm <markm@FreeBSD.org> | 1998-08-06 21:41:13 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1998-08-06 21:41:13 +0000 |
| commit | ec4dc9550e180509f05a84dba8f7d0f654e6de13 (patch) | |
| tree | ce6f1b32584b0c69c290c4f5b471b62bbd376af6 /usr.bin | |
| parent | 02824f2ad90badfccd8ca483c483615d1526ce95 (diff) | |
| download | FreeBSD-src-ec4dc9550e180509f05a84dba8f7d0f654e6de13.zip FreeBSD-src-ec4dc9550e180509f05a84dba8f7d0f654e6de13.tar.gz | |
Fix LIBDIR (for aout/ELF).
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/login/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/rlogin/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/rsh/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/su/Makefile | 2 |
5 files changed, 8 insertions, 6 deletions
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} |
