2 files changed, 15 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index dade63953..43f28ab10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030923
+ - (dtucker) [configure.ac] Bug #644: Fix "make clean" for out-of-tree
+   builds.  Portability corrections from tim@.
+
 20030919
  - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
    djast AT cs.toronto.edu
@@ -1133,4 +1137,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3008 2003/09/19 11:25:23 dtucker Exp $
+$Id: ChangeLog,v 1.3009 2003/09/22 00:58:55 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index 8a8774461..4368132e5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 dtucker Exp $
+# $Id: Makefile.in,v 1.250 2003/09/22 00:58:56 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -192,20 +192,18 @@ ssh_prng_cmds.out:	ssh_prng_cmds
 moduli:
         echo
 
-clean:
+clean:  regressclean
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
         rm -f *.out core 
         (cd openbsd-compat && $(MAKE) clean)
-        (cd regress && $(MAKE) clean)
 
-distclean:
+distclean:      regressclean
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
         rm -f *.out core
         rm -f Makefile config.h config.status ssh_prng_cmds *~
         rm -rf autom4te.cache
         (cd openbsd-compat && $(MAKE) distclean)
         (cd scard && $(MAKE) distclean)
-        (cd regress && $(MAKE) distclean)
 
 veryclean: distclean
         rm -f configure config.h.in *.0
@@ -373,6 +371,8 @@ uninstall:
 tests:  $(TARGETS)
         BUILDDIR=`pwd`; \
         [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
+        [ -f `pwd`/regress/Makefile ]  || \
+            ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
         TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
         TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
         TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -398,3 +398,8 @@ tests:	$(TARGETS)
                 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
                 EXEEXT="$(EXEEXT)" \
                 $@
+
+regressclean:
+        if [ -f regress/Makefile -a -r regress/Makefile ]; then \
+                (cd regress && $(MAKE) clean) \
+        fi