summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in14
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c15f7331b..246860551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120020712
2 - (tim) [Makefile.in] quiet down install-files: and check-user:
3
120020710 420020710
2 - (tim) [contrib/cygwin/ssh-host-config] explicitely sets the permissions 5 - (tim) [contrib/cygwin/ssh-host-config] explicitely sets the permissions
3 on /var/empty to 755 Patch by vinschen@redhat.com 6 on /var/empty to 755 Patch by vinschen@redhat.com
@@ -1345,4 +1348,4 @@
1345 - (stevesk) entropy.c: typo in debug message 1348 - (stevesk) entropy.c: typo in debug message
1346 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1349 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1347 1350
1348$Id: ChangeLog,v 1.2359 2002/07/11 04:01:29 mouring Exp $ 1351$Id: ChangeLog,v 1.2360 2002/07/12 16:04:06 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 1d71cf34b..6e7cb1876 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.220 2002/07/09 02:10:06 tim Exp $ 1# $Id: Makefile.in,v 1.221 2002/07/12 16:04:07 tim 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@
@@ -202,7 +202,7 @@ install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-user
202install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files 202install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
203 203
204check-user: 204check-user:
205 id $(SSH_PRIVSEP_USER) || \ 205 @id $(SSH_PRIVSEP_USER) || \
206 echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist" 206 echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist"
207 207
208scard-install: 208scard-install:
@@ -253,17 +253,17 @@ install-files: scard-install
253 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ 253 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
254 $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ 254 $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
255 fi 255 fi
256 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ 256 @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
257 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ 257 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
258 else \ 258 else \
259 echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ 259 echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
260 fi 260 fi
261 if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ 261 @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
262 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ 262 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
263 else \ 263 else \
264 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ 264 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
265 fi 265 fi
266 if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ 266 @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
267 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ 267 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
268 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ 268 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
269 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ 269 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
@@ -271,7 +271,7 @@ install-files: scard-install
271 echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ 271 echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
272 fi ; \ 272 fi ; \
273 fi 273 fi
274 if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ 274 @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
275 if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ 275 if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
276 echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ 276 echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
277 mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ 277 mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
@@ -283,7 +283,7 @@ install-files: scard-install
283 fi 283 fi
284 284
285host-key: ssh-keygen$(EXEEXT) 285host-key: ssh-keygen$(EXEEXT)
286 if [ -z "$(DESTDIR)" ] ; then \ 286 @if [ -z "$(DESTDIR)" ] ; then \
287 if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ 287 if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \
288 echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ 288 echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \
289 else \ 289 else \