summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ec48c237..058579f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120130602
2 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
3 linking regress/modpipe.
4
120130601 520130601
2 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to 6 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
3 using openssl's DES_crypt function on platorms that don't have a native 7 using openssl's DES_crypt function on platorms that don't have a native
diff --git a/Makefile.in b/Makefile.in
index 62bacd6fc..438baaca6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.337 2013/03/22 17:14:33 tim Exp $ 1# $Id: Makefile.in,v 1.338 2013/06/02 01:38:23 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@
@@ -386,7 +386,7 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
386 [ -f `pwd`/regress/Makefile ] || \ 386 [ -f `pwd`/regress/Makefile ] || \
387 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile 387 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
388 $(CC) $(CPPFLAGS) -o $@ $? \ 388 $(CC) $(CPPFLAGS) -o $@ $? \
389 $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 389 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
390 390
391tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) 391tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)
392 BUILDDIR=`pwd`; \ 392 BUILDDIR=`pwd`; \