diff options
author | Darren Tucker <dtucker@zip.com.au> | 2012-12-17 15:59:42 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2012-12-17 15:59:42 +1100 |
commit | 0fc77297e6825ae83618c5137e190aa9f9dac9da (patch) | |
tree | 9a8542a69739d749e0becb3ebefbe1e685d696e0 | |
parent | 13cbff1e009c2a1f786e5d84bf78099c70949bf0 (diff) |
- (dtucker) [Makefile.in] Add some scaffolding so that the new regress
tests will work with VPATH directories.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20121217 | ||
2 | - (dtucker) [Makefile.in] Add some scaffolding so that the new regress | ||
3 | tests will work with VPATH directories. | ||
4 | |||
1 | 20121213 | 5 | 20121213 |
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"; \ |