tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability 

of shell constructs.  Patch from cjwatson at debian.org.
This commit is contained in:
Darren Tucker 2004-08-30 21:33:02 +10:00
parent 476b7ecfe4
commit 25a1234ef7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,8 @@
redhat.com, ok djm@ redhat.com, ok djm@
- (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too. Patch from - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too. Patch from
vinschen at redhat.com. 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 20040829
- (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from
@ -1714,4 +1716,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

6
Makefile.in
View File

@ -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 # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #SHELL = @SH@
@ -292,7 +292,7 @@ install-files: scard-install
else \ else \
echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
fi 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 \ if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
else \ else \
@ -406,7 +406,7 @@ tests: $(TARGETS)
$@ $@
regressclean: regressclean:
if [ -f regress/Makefile -a -r regress/Makefile ]; then \ if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
(cd regress && $(MAKE) clean) \ (cd regress && $(MAKE) clean) \
fi fi

2
contrib/ssh-copy-id
View File

@ -24,7 +24,7 @@ else
fi fi
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}" GET_ID="cat ${ID_FILE}"
fi fi