summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortim <tim>2013-06-02 01:38:23 +0000
committertim <tim>2013-06-02 01:38:23 +0000
commit0009a115163edafbe151e532b05568277d9dbe25 (patch)
tree8de463ac79c8783b1a34ccb6f48af47e107d0e18
parent887b4925c3080aab2f51a98ab7c041430c076f0b (diff)
downloadopenssh-0009a115163edafbe151e532b05568277d9dbe25.tar.gz
20130602
- (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy linking regress/modpipe.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ec48c23..058579f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20130602
+ - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
+ linking regress/modpipe.
+
20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
using openssl's DES_crypt function on platorms that don't have a native
diff --git a/Makefile.in b/Makefile.in
index 62bacd6f..438baaca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.337 2013/03/22 17:14:33 tim Exp $
+# $Id: Makefile.in,v 1.338 2013/06/02 01:38:23 tim Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -386,7 +386,7 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
[ -f `pwd`/regress/Makefile ] || \
ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
$(CC) $(CPPFLAGS) -o $@ $? \
- $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+ $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)
BUILDDIR=`pwd`; \