summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-11-11 08:47:18 +1100
committerDamien Miller <djm@mindrot.org>2000-11-11 08:47:18 +1100
commit895f2386726172f0fd1a2ebb6da405282a5d37e1 (patch)
tree71f75ed3652b9d2eaffbed1bd686ea15ee36c49d
parent0986b55a601066b1dc896c4508a55e905ea8d0ea (diff)
- (djm) Fix new Makefile.in warnings
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in16
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index dcfa364b9..2d25eebb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120001111 120001111
2 - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and 2 - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and
3 packaging files 3 packaging files
4 - (djm) Fix new Makefile.in warnings
4 5
520001110 620001110
6 - (bal) Fixed dropped answer from skey_keyinfo() in auth1.c 7 - (bal) Fixed dropped answer from skey_keyinfo() in auth1.c
diff --git a/Makefile.in b/Makefile.in
index 362fd7084..1ea4366a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -152,26 +152,26 @@ install-files:
152 fi 152 fi
153 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ 153 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
154 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ 154 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
155 else \ 155 else ;\
156 echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite" \ 156 echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite" ;\
157 fi 157 fi
158 if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ 158 if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
159 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ 159 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
160 else \ 160 else ;\
161 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite" \ 161 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite" ;\
162 fi 162 fi
163 if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ 163 if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
164 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ 164 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
165 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ 165 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
166 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ 166 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
167 else \ 167 else ;\
168 echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite" \ 168 echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite" ;\
169 fi ; \ 169 fi ; \
170 fi 170 fi
171 if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \ 171 if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \
172 $(INSTALL) -m 644 primes $(DESTDIR)$(sysconfdir)/primes; \ 172 $(INSTALL) -m 644 primes $(DESTDIR)$(sysconfdir)/primes; \
173 else \ 173 else ;\
174 echo "$(DESTDIR)$(sysconfdir)/primes already exists, install will not overwrite" \ 174 echo "$(DESTDIR)$(sysconfdir)/primes already exists, install will not overwrite" ;\
175 fi 175 fi
176 176
177host-key: ssh-keygen$(EXEEXT) 177host-key: ssh-keygen$(EXEEXT)