--- work.old/ztelnet/libtelnet/Makefile.generic.orig	Wed Sep 20 12:52:44 1995
+++ work/ztelnet/libtelnet/Makefile.generic	Thu Jun  6 23:23:00 2002
@@ -19,32 +19,24 @@
 #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
 #
 
-LIB=	libtelnet.a
-SRCS=	auth.c encrypt.c genget.c \
+LIB=    libtelnet.a
+SRCS=   auth.c encrypt.c genget.c \
 	misc.c enc_des.c \
 	setenv.c getent.c strdup.c strcasecmp.c \
 	strchr.c strrchr.c strftime.c strerror.c \
 	${LIB_SRC}
 
-OBJS=	auth.o encrypt.o genget.o \
+OBJS=   auth.o encrypt.o genget.o \
 	misc.o enc_des.o \
 	${LIB_OBJ}
 
-ifeq (linux,${LINUX})
-TELNET_H=	../arpa/tel-lnx.h
-CFLAGS=	${LCCFLAGS} ${INCLUDES} ${DEFINES}
-else
-TELNET_H=	../arpa/telnet.h
-CFLAGS=	-O ${DEFINES} ${INCLUDES}
-endif
+TELNET_H= ../arpa/telnet.h
+
+CFLAGS+= ${DEFINES} ${INCLUDES}
 
 ${LIB}: ${OBJS}
 	rm -f ${LIB}
-ifeq (linux,${LINUX})
-	${AR} ${ARFLAGS} ${LIB} ${OBJS}
-else
 	${AR} ${ARFLAGS} ${LIB} `lorder ${OBJS} | tsort`
-endif
 	@if [ ${RANLIB} != NONE ]; \
 		then echo ${RANLIB} ${LIB}; ${RANLIB} ${LIB}; fi