Fix LIBDIR (for aout/ELF).

This commit is contained in:
Mark Murray 1998-08-06 21:41:13 +00:00
parent 60175a9772
commit 448bbb5805
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38149
10 changed files with 17 additions and 13 deletions

View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}

View File

@ -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 \

View File

@ -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 \

View File

@ -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- \

View File

@ -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}