20001116

 - (bal) Added in MAXSYMLINK test in bsd-realpath.c.  Required for some SCO
   releases.
 - (bal) Make builds work outside of source tree.  Patch by Mark D. Roth
   <roth@feep.net>

3 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e85bff07..64e36d0e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20001116
+ - (bal) Added in MAXSYMLINK test in bsd-realpath.c.  Required for some SCO
+   releases.
+ - (bal) Make builds work outside of source tree.  Patch by Mark D. Roth
+   <roth@feep.net>
+
 20001113
  - (djm) Add pointer to http://www.imasy.or.jp/~gotoh/connect.c to 
    contrib/README
diff --git a/Makefile.in b/Makefile.in
index 7967cc57b..c01859ac0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -179,24 +179,24 @@ host-key: ssh-keygen$(EXEEXT)
                 if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \
                         echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \
                 else \
-                        $(srcdir)/ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \
+                        ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \
                 fi ; \
                 if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \
                         echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
                 else \
-                        $(srcdir)/ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \
+                        ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \
                 fi ; \
                 if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key ] ; then \
                         echo "$(DESTDIR)$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \
                 else \
-                        $(srcdir)/ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" ; \
+                        ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" ; \
                 fi ; \
         fi ;
 
 host-key-force: ssh-keygen$(EXEEXT)
-        $(srcdir)/ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
-        $(srcdir)/ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
-        $(srcdir)/ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
+        ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
+        ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
+        ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
 
 uninstallall:   uninstall
         -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
diff --git a/bsd-realpath.c b/bsd-realpath.c
index 103dcc256..baf17f1a4 100644
--- a/bsd-realpath.c
+++ b/bsd-realpath.c
@@ -52,6 +52,13 @@ static char *rcsid = "$OpenBSD: realpath..c,v 1.4 1998/05/18 09:55:19 deraadt Ex
 #endif
 
 /*
+ * MAXSYMLINKS
+ */
+#ifndef MAXSYMLINKS
+#define MAXSYMLINKS 5
+#endif
+
+/*
  * char *realpath(const char *path, char resolved_path[MAXPATHLEN]);
  *
  * Find the real name of path, by removing all ".", ".." and symlink