Make links work with both --with-krb4 and --with-krb4=/usr/athena

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5638 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 29aa6a4aac46f248ee56d4a3c8fcceb7efae7fff..612b8540113c455bf619d018dad126ec1b731a0c 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,9 @@
+
+Fri Apr 28 16:55:14 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * Makefile.in   - change position of KRB4_LIB for krshd and krlogind
+                         so that it links correctly for both --with-krb4
+                         and --with-krb4=/usr/athena.
+
 Fri Apr 28 16:12:57 1995  Mark Eichin  <eichin@cygnus.com>
 
        * configure.in (PATH): use internal AC_PROG_ECHO_N because change

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 6063410bd21c74ee11933eb5d67a3c3aa317543a..4f2849d020b4b2df73a71827edbc813439490496 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -53,14 +53,14 @@ 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) $(KRB4_LIB) $(KLIB) $(LIBS)
+       $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(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) $(KRB4_LIB) $(KLIB) $(LIBS)
+       $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind