- (dtucker) [Makefile.in] Bug #1177: fix incorrect path for sshrc in

   Makefile.  Patch from santhi.amirta at gmail, ok djm.

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d7bf2d9d3..6fd1ec198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060822
+ - (dtucker) [Makefile.in] Bug #1177: fix incorrect path for sshrc in
+   Makefile.  Patch from santhi.amirta at gmail, ok djm.
+
 20060820
  - (dtucker) [log.c] Move ifdef to prevent unused variable warning.
  - (dtucker) [configure.ac] Save $LIBS during PAM library tests and restore
@@ -5284,4 +5288,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.4503 2006/08/20 11:43:19 dtucker Exp $
+$Id: ChangeLog,v 1.4504 2006/08/22 12:24:10 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index fe510028f..e1f86dbef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.279 2006/07/24 05:30:19 djm Exp $
+# $Id: Makefile.in,v 1.280 2006/08/22 12:24:11 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -108,7 +108,7 @@ PATHSUBS	= \
         -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
         -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
         -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
-        -e 's|/etc/sshrc|$(sysconfdir)/sshrc|g' \
+        -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
         -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
         -e 's|/var/empty|$(PRIVSEP_PATH)|g' \
         -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'