--- work.old/ztelnet/telnet/Makefile.generic.orig	Wed Sep 20 12:42:39 1995
+++ work/ztelnet/telnet/Makefile.generic	Thu Jun  6 23:23:29 2002
@@ -19,28 +19,22 @@
 #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
 #
 
-INCLUDES=	-I..
-
-ifeq (linux,${LINUX})
-ARPA_TELNET=	../arpa/tel-lnx.h
-CFLAGS=	${LCCFLAGS} ${INCLUDES} ${DEFINES}
-else
-ARPA_TELNET=	../arpa/telnet.h
-CFLAGS=	-O ${INCLUDES} ${DEFINES}
-endif
+INCLUDES= -I..
+ARPA_TELNET= ../arpa/telnet.h
 
 SRCS=	commands.c main.c network.c ring.c \
 	sys_bsd.c telnet.c terminal.c \
 	utilities.c ${GETOPT_SRC}
 
+CFLAGS+=	${INCLUDES} ${DEFINES}
 
 ALLHC=	${SRCS} \
 	defines.h externs.h fdset.h general.h \
 	ring.h types.h
 
 OBJS=	authenc.o commands.o main.o network.o ring.o sys_bsd.o \
-	telnet.o terminal.o utilities.o ${GETOPT_OBJ} \
-	../zmodem/rz.o ../zmodem/sz.o
+	telnet.o terminal.o utilities.o ${GETOPT_OBJ}
+
 MAN=	telnet.0
 
 #
@@ -73,8 +67,8 @@
 	mkdep ${CFLAGS} `make clist`
 
 install: ${MAN} FRC
-	install -s -o bin -g bin -m 755 telnet ${LIBEXEC}
-	install -c -o bin -g bin -m 444 telnet.0 ${DEST}/man/cat1
+	install -s -o bin -g bin -m 755 telnet ${DEST}
+	install -c -o bin -g bin -m 444 telnet.0 ${DESTDIR}/usr/man/cat1
 
 lint: FRC ${SRCS}
 	lint ${CFLAGS} `make clist`