summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-08-29 19:52:32 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-08-29 19:52:32 +1000
commit2a502ff31031622d983db9846d15682c368f8801 (patch)
tree6b85d75e946b534bc0b3346256fdc78b47a43303
parent0521dcb22eb6c5478c4b652cfc6bb777499aeba7 (diff)
- (dtucker) [Makefile.in] Get regress/Makefile symlink right for out-of-tree
builds too, from vinschen at redhat.com.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0680b2201..882a52abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
32 jason at devrandom.org. 32 jason at devrandom.org.
33 - (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like 33 - (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like
34 files ending in .exe that aren't binaries; patch from vinschen at redhat.com. 34 files ending in .exe that aren't binaries; patch from vinschen at redhat.com.
35 - (dtucker) [Makefile.in] Get regress/Makefile symlink right for out-of-tree
36 builds too, from vinschen at redhat.com.
35 37
3620040828 3820040828
37 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from 39 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1699,4 +1701,4 @@
1699 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1701 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1700 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1702 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1701 1703
1702$Id: ChangeLog,v 1.3532 2004/08/29 09:39:09 dtucker Exp $ 1704$Id: ChangeLog,v 1.3533 2004/08/29 09:52:32 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index a603609ae..ded7b9372 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.263 2004/08/15 11:01:37 dtucker Exp $ 1# $Id: Makefile.in,v 1.264 2004/08/29 09:52:32 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -376,7 +376,7 @@ tests: $(TARGETS)
376 BUILDDIR=`pwd`; \ 376 BUILDDIR=`pwd`; \
377 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ 377 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
378 [ -f `pwd`/regress/Makefile ] || \ 378 [ -f `pwd`/regress/Makefile ] || \
379 ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ 379 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
380 TEST_SHELL="@TEST_SHELL@"; \ 380 TEST_SHELL="@TEST_SHELL@"; \
381 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 381 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
382 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ 382 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \