diff options
| author | tim <tim> | 2013-03-22 17:14:32 +0000 |
|---|---|---|
| committer | tim <tim> | 2013-03-22 17:14:32 +0000 |
| commit | a0061f13b8d357dd7afa737b61e10cfa0166b4c7 (patch) | |
| tree | 633b149f5f5421cb7fdf524ddc7a298e50f5c6d8 | |
| parent | c63007022256d61c43c6ed26649efdb543662b9f (diff) | |
| download | openssh-a0061f13b8d357dd7afa737b61e10cfa0166b4c7.tar.gz | |
- (tim) [Makefile.in] remove some duplication introduced in 20130220 commit.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 9 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,6 @@ +20120323 + - (tim) [Makefile.in] remove some duplication introduced in 20130220 commit. + 20120322 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil Hands' greatly revised version. diff --git a/Makefile.in b/Makefile.in index d327787b..62bacd6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $ +# $Id: Makefile.in,v 1.337 2013/03/22 17:14:33 tim Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -382,15 +382,14 @@ uninstall: -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c - [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ + [ -d `pwd`/regress ] || mkdir -p `pwd`/regress + [ -f `pwd`/regress/Makefile ] || \ + ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile $(CC) $(CPPFLAGS) -o $@ $? \ $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) BUILDDIR=`pwd`; \ - [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ - [ -f `pwd`/regress/Makefile ] || \ - ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ TEST_SHELL="@TEST_SHELL@"; \ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |