diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -7,6 +7,10 @@ | |||
7 | [PROTOCOL.mux] | 7 | [PROTOCOL.mux] |
8 | correct protocol names and add a couple of missing protocol number | 8 | correct protocol names and add a couple of missing protocol number |
9 | defines; patch from bert.wesarg AT googlemail.com | 9 | defines; patch from bert.wesarg AT googlemail.com |
10 | - (djm) [Makefile.in] Use shell test to disable ecdsa key generating in | ||
11 | host-key-force target rather than a substitution that is replaced with a | ||
12 | comment so that the Makefile.in is still a syntactically valid Makefile | ||
13 | (useful to run the distprep target) | ||
10 | 14 | ||
11 | 20110213 | 15 | 20110213 |
12 | - (djm) [misc.c] include time.h for nanosleep() prototype | 16 | - (djm) [misc.c] include time.h for nanosleep() prototype |
diff --git a/Makefile.in b/Makefile.in index ea6fadc4a..3ace262e8 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.317 2011/01/13 06:35:46 tim Exp $ | 1 | # $Id: Makefile.in,v 1.318 2011/01/14 03:47:40 djm 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@ |
@@ -354,7 +354,7 @@ host-key-force: ssh-keygen$(EXEEXT) | |||
354 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" | 354 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" |
355 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" | 355 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" |
356 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" | 356 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" |
357 | @COMMENT_OUT_ECC@ ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" | 357 | test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" |
358 | 358 | ||
359 | uninstallall: uninstall | 359 | uninstallall: uninstall |
360 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config | 360 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |