diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.in | 9 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20120323 | ||
2 | - (tim) [Makefile.in] remove some duplication introduced in 20130220 commit. | ||
3 | |||
1 | 20120322 | 4 | 20120322 |
2 | - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil | 5 | - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil |
3 | Hands' greatly revised version. | 6 | Hands' greatly revised version. |
diff --git a/Makefile.in b/Makefile.in index d327787b0..62bacd6fc 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $ | 1 | # $Id: Makefile.in,v 1.337 2013/03/22 17:14:33 tim 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@ |
@@ -382,15 +382,14 @@ uninstall: | |||
382 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 382 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
383 | 383 | ||
384 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c | 384 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c |
385 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 385 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress |
386 | [ -f `pwd`/regress/Makefile ] || \ | ||
387 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | ||
386 | $(CC) $(CPPFLAGS) -o $@ $? \ | 388 | $(CC) $(CPPFLAGS) -o $@ $? \ |
387 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 389 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
388 | 390 | ||
389 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | 391 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) |
390 | BUILDDIR=`pwd`; \ | 392 | BUILDDIR=`pwd`; \ |
391 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
392 | [ -f `pwd`/regress/Makefile ] || \ | ||
393 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ | ||
394 | TEST_SHELL="@TEST_SHELL@"; \ | 393 | TEST_SHELL="@TEST_SHELL@"; \ |
395 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 394 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
396 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 395 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |