From 818849c5faab7d31975acac6648f262291edfaf3 Mon Sep 17 00:00:00 2001
From: Mark Eichin <eichin@mit.edu>
Date: Fri, 28 Apr 1995 22:01:21 +0000
Subject: [PATCH] 	* Makefile.in (KLIB): include KRB4_LIB directly, to
 satisfy both 	versions of the dependencies.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5644 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/bsd/ChangeLog   | 4 ++++
 src/appl/bsd/Makefile.in | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 612b85401..59155fd25 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 17:59:19 1995  Mark Eichin  <eichin@cygnus.com>
+
+	* Makefile.in (KLIB): include KRB4_LIB directly, to satisfy both
+	versions of the dependencies.
 
 Fri Apr 28 16:55:14 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in	- change position of KRB4_LIB for krshd and krlogind
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 4f2849d02..6eee974f8 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -4,7 +4,7 @@ SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 KRB4_LIB = @KRB4_LIB@
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 LOGINLIBS = @LOGINLIBS@
@@ -53,21 +53,21 @@ install::
 	$(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1
 
 krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(LIBS)
+	$(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd
 	$(INSTALL_DATA) $(srcdir)/krshd.M ${DESTDIR}$(SERVER_MANDIR)/krshd.8
 
 krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(LIBS)
+	$(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind
 	$(INSTALL_DATA) $(srcdir)/krlogind.M ${DESTDIR}$(SERVER_MANDIR)/krlogind.8
 
 login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KRB4_LIB) $(KLIB) $(LIBS) $(LOGINLIBS)
+	$(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) $(LOGINLIBS)
 
 install::
 	$(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5
-- 
2.26.2