summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 94bf7e918..1d232d06b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120000920
2 - (djm) Fix bad path substitution. Report from Andrew Miner
3 <asminer@cs.iastate.edu>
4
120000916 520000916
2 - (djm) Fix SSL search order from Lutz Jaenicke 6 - (djm) Fix SSL search order from Lutz Jaenicke
3 <Lutz.Jaenicke@aet.TU-Cottbus.DE> 7 <Lutz.Jaenicke@aet.TU-Cottbus.DE>
diff --git a/Makefile.in b/Makefile.in
index f3a19c0fd..e21778bac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,7 +48,7 @@ MANPAGES = @MANTYPE@
48 48
49CONFIGFILES=sshd_config ssh_config 49CONFIGFILES=sshd_config ssh_config
50 50
51PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/var/run/sshd.pid=$(piddir)/sshd.pid 51PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/var/run/sshd.pid=$(piddir)/sshd.pid
52 52
53FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) 53FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
54 54