- (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree

   builds.  Portability corrections from tim@.

diff --git a/ChangeLog b/ChangeLog
index b9557b9f51a32933ba1f350b3d977e6896f4529f..ad92ecd601954c3ec1d5d61be43fc3448a348408 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030923
+ - (dtucker) [Makefile.in] 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

diff --git a/Makefile.in b/Makefile.in
index 82a9836e182ae715b7a7e6c801e9fc914342d1a3..d04d5d0439f3fe50367754a01d9b4c76b264d925 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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