diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 20 |
2 files changed, 13 insertions, 9 deletions
@@ -50,6 +50,8 @@ | |||
50 | [cipher.c kex.c servconf.c] | 50 | [cipher.c kex.c servconf.c] |
51 | strtok() --> strsep(). (niels@ ok) | 51 | strtok() --> strsep(). (niels@ ok) |
52 | - (djm) Fix problem with debug mode and MaxStartups | 52 | - (djm) Fix problem with debug mode and MaxStartups |
53 | - (djm) Don't generate host keys when $(DESTDIR) is set (e.g. during RPM | ||
54 | builds) | ||
53 | 55 | ||
54 | 20000709 | 56 | 20000709 |
55 | - (djm) Only enable PAM_TTY kludge for Linux. Problem report from | 57 | - (djm) Only enable PAM_TTY kludge for Linux. Problem report from |
diff --git a/Makefile.in b/Makefile.in index d8a3f4685..23e2bce8f 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -150,15 +150,17 @@ install-files: | |||
150 | fi | 150 | fi |
151 | 151 | ||
152 | host-key: ssh-keygen | 152 | host-key: ssh-keygen |
153 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ | 153 | if [ -z "$(DESTDIR)" ] ; then \ |
154 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ | 154 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ |
155 | else \ | 155 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ |
156 | ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ | 156 | else \ |
157 | fi ; \ | 157 | ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ |
158 | if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ | 158 | fi ; \ |
159 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ | 159 | if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ |
160 | else \ | 160 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ |
161 | ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ | 161 | else \ |
162 | ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ | ||
163 | fi ; \ | ||
162 | fi ; | 164 | fi ; |
163 | 165 | ||
164 | host-key-force: ssh-keygen | 166 | host-key-force: ssh-keygen |