--- Makefile.in.orig	Thu Jan 17 08:35:34 2002
+++ Makefile.in	Wed Jan  8 18:13:41 2003
@@ -307,11 +307,13 @@
 
 SHELL = /bin/sh
 
-GMPDIR 		= gmp-2.0.2-ssh-2
-GMPLIBS 	= @ssh_gmp_ldadd_options@
-GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
+GMPDIR		=
+GMPINCDIR	?= /usr/include
+GMPLIBDIR 	?= /usr/lib
+GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
+GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
 
-ZLIBDIR		= zlib-1.0.4
+ZLIBDIR		= /usr/lib
 ZLIBDEP		= $(ZLIBDIR)/libz.a
 ZLIBLIBS	= @ssh_zlib_ldadd_options@
 
@@ -418,17 +420,19 @@
 	$(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$(GMPINCDIR) $(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
 	$(CC) $(LDFLAGS) -o sshd $(SSHD_OBJS) \
-		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) $(KERBEROS_LIBS)
+		$(KERBEROS_LIBS) \
+		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS)
 
 ssh: $(SSH_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
 	-rm -f ssh
 	$(CC) $(LDFLAGS) -o ssh $(SSH_OBJS) \
-		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) $(KERBEROS_LIBS)
+		$(KERBEROS_LIBS) \
+		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS)
 
 ssh-keygen: $(KEYGEN_OBJS) $(GMPDEP) $(RSAREFDEP)
 	-rm -f ssh-keygen
@@ -436,7 +440,9 @@
 
 ssh-agent: $(AGENT_OBJS) $(GMPDEP) $(RSAREFDEP)
 	-rm -f ssh-agent
-	$(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) $(GMPLIBS) $(LIBS) $(KERBEROS_LIBS) 
+	$(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) \
+	$(KERBEROS_LIBS) \
+	$(GMPLIBS) $(LIBS)
 
 ssh-add: $(ADD_OBJS) $(GMPDEP) $(RSAREFDEP)
 	-rm -f ssh-add
@@ -461,12 +467,12 @@
 	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
 	chmod +x make-ssh-known-hosts
 
-GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
+XXX_DONT_GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
 		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
-$(GMPDIR)/libgmp.a:
+XXX_DONT_$(GMPDIR)/libgmp.a:
 	cd $(GMPDIR); $(MAKE)
 
-$(ZLIBDEP):
+XXX_DONT_$(ZLIBDEP):
 	-if test '!' -d $(ZLIBDIR); then \
 	  mkdir $(ZLIBDIR); \
 	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
@@ -530,7 +536,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 +762,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