--- Makefile.in.orig	Thu Jan 17 05:35:34 2002
+++ Makefile.in	Sat Jun 29 20:37:40 2002
@@ -307,11 +307,11 @@
 
 SHELL = /bin/sh
 
-GMPDIR 		= gmp-2.0.2-ssh-2
+GMPDIR 		= $(PREFIX)
 GMPLIBS 	= @ssh_gmp_ldadd_options@
-GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
+GMPDEP 		=
 
-ZLIBDIR		= zlib-1.0.4
+ZLIBDIR		= /usr/lib
 ZLIBDEP		= $(ZLIBDIR)/libz.a
 ZLIBLIBS	= @ssh_zlib_ldadd_options@
 
@@ -418,7 +418,7 @@
 	$(CC) -o rfc-pg rfc-pg.o
 
 .c.o:
-	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
 
 sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
 	-rm -f sshd
@@ -466,7 +466,7 @@
 $(GMPDIR)/libgmp.a:
 	cd $(GMPDIR); $(MAKE)
 
-$(ZLIBDEP):
+XXX_DONT_$(ZLIBDEP):
 	-if test '!' -d $(ZLIBDIR); then \
 	  mkdir $(ZLIBDIR); \
 	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
@@ -530,7 +530,7 @@
 # (otherwise it can only log in as the user it runs as, and must be
 # bound to a non-privileged port).  Also, password authentication may
 # not be available if non-root and using shadow passwords.
-install: $(PROGRAMS) make-dirs generate-host-key install-configs
+install: $(PROGRAMS) make-dirs install-configs
 	-rm -f $(install_prefix)$(bindir)/ssh1.old
 	-chmod 755 $(install_prefix)$(bindir)/ssh1
 	-chmod 755 $(install_prefix)$(bindir)/ssh
@@ -756,7 +756,7 @@
 	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
 
 depend:
-	$(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS)
+	$(MAKEDEP) -I$(srcdir) -I.                          $(DEFS) $(SRCS)
 
 tags:
 	-rm -f TAGS
