summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 16a6489e5..86f756423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120121217
2 - (dtucker) [Makefile.in] Add some scaffolding so that the new regress
3 tests will work with VPATH directories.
4
120121213 520121213
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2012/12/12 16:45:52 7 - markus@cvs.openbsd.org 2012/12/12 16:45:52
diff --git a/Makefile.in b/Makefile.in
index e4f9ee194..8765b7efb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.328 2012/10/05 05:41:07 dtucker Exp $ 1# $Id: Makefile.in,v 1.329 2012/12/17 04:59:43 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@
@@ -384,6 +384,9 @@ tests interop-tests: $(TARGETS)
384 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ 384 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
385 [ -f `pwd`/regress/Makefile ] || \ 385 [ -f `pwd`/regress/Makefile ] || \
386 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ 386 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
387 [ -f `pwd`/regress/modpipe.c ] || \
388 ln -s `cd $(srcdir) && pwd`/regress/modpipe.c `pwd`/regress/modpipe.c; \
389 (cd regress && make prereq); \
387 TEST_SHELL="@TEST_SHELL@"; \ 390 TEST_SHELL="@TEST_SHELL@"; \
388 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 391 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
389 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ 392 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \