diff options
| author | Damien Miller <djm@mindrot.org> | 2011-01-14 14:47:37 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-01-14 14:47:37 +1100 |
| commit | e9b40487fa41696a8f045ff7a5447ce9da511913 (patch) | |
| tree | 325c2968e1a1f518e3d06dcbe16707f3f25ba796 | |
| parent | 42747df8b7986912b008b4341a707f80dd147997 (diff) | |
- (djm) [Makefile.in] Use shell test to disable ecdsa key generating in
host-key-force target rather than a substitution that is replaced with a
comment so that the Makefile.in is still a syntactically valid Makefile
(useful to run the distprep target)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -7,6 +7,10 @@ [PROTOCOL.mux] correct protocol names and add a couple of missing protocol number defines; patch from bert.wesarg AT googlemail.com + - (djm) [Makefile.in] Use shell test to disable ecdsa key generating in + host-key-force target rather than a substitution that is replaced with a + comment so that the Makefile.in is still a syntactically valid Makefile + (useful to run the distprep target) 20110213 - (djm) [misc.c] include time.h for nanosleep() prototype diff --git a/Makefile.in b/Makefile.in index ea6fadc4..3ace262e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.317 2011/01/13 06:35:46 tim Exp $ +# $Id: Makefile.in,v 1.318 2011/01/14 03:47:40 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -354,7 +354,7 @@ host-key-force: ssh-keygen$(EXEEXT) ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" -@COMMENT_OUT_ECC@ ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" + test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" uninstallall: uninstall -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |