- (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)

diff --git a/ChangeLog b/ChangeLog
index 5ea138ed7b2296af893fe5627f054f9923e06aff..f441d8d63d98fa2c87d99d799e325668efe1ab3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ea6fadc4a1ab9dad0da48f0a8043a246bca047b5..3ace262e8766d1b67f8e8c4858d2fa99bfe15e21 100644 (file)
--- 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