3 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c302eef95..ffabb0510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    redhat.com, ok djm@
  - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too.  Patch from
    vinschen at redhat.com.
+ - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability
+   of shell constructs.  Patch from cjwatson at debian.org.
 
 20040829
  - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from
@@ -1714,4 +1716,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3538 2004/08/30 11:13:49 dtucker Exp $
+$Id: ChangeLog,v 1.3539 2004/08/30 11:33:02 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index ded7b9372..db9eb34ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.264 2004/08/29 09:52:32 dtucker Exp $
+# $Id: Makefile.in,v 1.265 2004/08/30 11:33:02 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -292,7 +292,7 @@ install-files: scard-install
         else \
                 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
         fi
-        @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+        @if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
                 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
                         $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
                 else \
@@ -406,7 +406,7 @@ tests:	$(TARGETS)
                 $@
 
 regressclean:
-        if [ -f regress/Makefile -a -r regress/Makefile ]; then \
+        if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
                 (cd regress && $(MAKE) clean) \
         fi
 
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1c0a9234..1555b5d37 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
+if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
   GET_ID="cat ${ID_FILE}"
 fi