From: Theodore Tso <tytso@mit.edu>
Date: Thu, 3 Jun 1993 12:18:48 +0000 (+0000)
Subject: Change to work with Kerboers Imake structure
X-Git-Tag: krb5-1.0-beta3~235
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0217fc3224364d46984932ca3d758480350fbe2;p=krb5.git

Change to work with Kerboers Imake structure

Changed to include Kerberos libraries.

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

diff --git a/src/appl/telnet/Config.generic b/src/appl/telnet/Config.generic
index e5e6d60ef..bdd2eca40 100644
--- a/src/appl/telnet/Config.generic
+++ b/src/appl/telnet/Config.generic
@@ -180,6 +180,11 @@
 #    Name of "ranlib" program, set it to "NONE" if you don't
 #    have a "ranlib".
 
+ODEFS="-DKRB5 -DAUTHENTICATION"
+KRB_INC= -I../../../include
+KRB_LIBS=" $(KLIB)"
+KRB_LIBPATH=" $(DEPKLIB)"
+
 all:
 	@echo "you must specify what type of system you are on,"
 	@echo "or modify the makefile for your system."
@@ -244,22 +249,21 @@ all:
 		CC="${CC}" LCCFLAGS="-O"
 
 4.3bsd:
-	@echo $@ is untested... it may or may not work..."
 	make -f Makefile.generic ${WHAT} \
-		LIBS="-ltermcap ../libtelnet/libtelnet.a" \
+		LIBS="-ltermcap ../libtelnet/libtelnet.a"${KRB_LIBS} \
 		LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
-				../libtelnet/libtelnet.a" \
+				../libtelnet/libtelnet.a"${KRB_LIBPATH} \
 		DEST=${DESTDIR}/usr/bin \
-		DEFINES=${ODEFS}"-DTERMCAP -DKLUDGELINEMODE \
+		DESTDIR=${DESTDIR} \
+		DEFINES=${ODEFS}" -DTERMCAP -DKLUDGELINEMODE \
 		    -DDEFAULT_IM='\"\r\n4.3BSD UNIX (%h) (%t)\r\n\r\r\n\r\"' \
 			-DDIAGNOSTICS" \
-		INCLUDES="-I.." \
-		LIB_OBJ="strdup.o setsid.o strftime.o \
+		INCLUDES=${KRB_INC}" -I.." \
+		LIB_OBJ="strdup.o setsid.o strftime.o strerror.o \
 			gettytab.o getopt.o herror.o" \
-		LIB_SRC="strdup.c setsid.c strftime.c \
+		LIB_SRC="strdup.c setsid.c strftime.c strerror.c \
 			gettytab.c getopt.c herror.c" \
 		AR=ar ARFLAGS=cq RANLIB=ranlib \
-		VPATH=/usr/src/etc/getty \
 		LIBEXEC=${DESTDIR}/etc \
 		CC="${CC}" LCCFLAGS="-O"
 
@@ -521,14 +525,15 @@ ultrix3.1:
 
 ultrix4.0:
 	make -f Makefile.generic ${WHAT} \
-		LIBS="-ltermcap ../libtelnet/libtelnet.a" \
+		LIBS="-ltermcap ../libtelnet/libtelnet.a"${KRB_LIBS} \
 		LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
-				../libtelnet/libtelnet.a" \
+				../libtelnet/libtelnet.a"${KRB_LIBPATH} \
 		DEST=${DESTDIR}/usr/ucb \
-		DEFINES=${ODEFS}"-DUSE_TERMIO -DTERMCAP \
+		DESTDIR=${DESTDIR} \
+		DEFINES=${ODEFS}" -DUSE_TERMIO -DTERMCAP \
 		    -DDEFAULT_IM='\"\r\nULTRIX V4.0 (%h) (%t)\r\n\r\r\n\r\"' \
 			-DKLUDGELINEMODE -DDIAGNOSTICS " \
-		INCLUDES="-I.." \
+		INCLUDES=${KRB_INC}" -I.." \
 		LIB_OBJ="getent.o strdup.o strerror.o setsid.o \
 			setenv.o strftime.o" \
 		LIB_SRC="getent.c strdup.c strerror.c setsid.c \