o Use ssh.d/ subdirectories for bin files and man pages.

diff --git a/openssh/Makefile.in b/openssh/Makefile.in
index 09b0108b72db095bffd42102a2d379531cea4a2b..11b11b84c959b92bed798e85b6863ab0fc3c2629 100644 (file)
--- a/openssh/Makefile.in
+++ b/openssh/Makefile.in
@@ -9,11 +9,11 @@ AUTORECONF=autoreconf
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-bindir=@bindir@
+bindir=@bindir@/ssh.d
 sbindir=@sbindir@
 libexecdir=@libexecdir@
 datadir=@datadir@
-mandir=@mandir@
+mandir=@mandir@/ssh.d
 mansubdir=@mansubdir@
 sysconfdir=$$GLOBUS_LOCATION/etc/ssh
 docdir=$$GLOBUS_LOCATION/doc/gsi_openssh
@@ -23,7 +23,7 @@ top_srcdir=@top_srcdir@
 
 DESTDIR=
 VPATH=@srcdir@
-SSH_PROGRAM=@bindir@/ssh
+SSH_PROGRAM=$(bindir)/ssh
 ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
 SFTP_SERVER=$(libexecdir)/sftp-server
 SSH_KEYSIGN=$(libexecdir)/ssh-keysign

diff --git a/openssh/filelist b/openssh/filelist
index 889cb36406adaea034a873ed291d51c8dd25faf9..136fb7f1424871dfa49a55fefe90d4dbd218369d 100644 (file)
--- a/openssh/filelist
+++ b/openssh/filelist
@@ -1,13 +1,13 @@
-bin/gsiscp
-bin/gsissh
-bin/scp
-bin/sftp
-bin/slogin
-bin/ssh
-bin/ssh-add
-bin/ssh-agent
-bin/ssh-keygen
-bin/ssh-keyscan
+bin/ssh.d/gsiscp
+bin/ssh.d/gsissh
+bin/ssh.d/scp
+bin/ssh.d/sftp
+bin/ssh.d/slogin
+bin/ssh.d/ssh
+bin/ssh.d/ssh-add
+bin/ssh.d/ssh-agent
+bin/ssh.d/ssh-keygen
+bin/ssh.d/ssh-keyscan
 doc/gsi_openssh/README
 doc/gsi_openssh/README.gpt
 doc/gsi_openssh/README.privsep
@@ -18,36 +18,36 @@ doc/gsi_openssh/CREDITS
 libexec/sftp-server
 libexec/ssh-keysign
 libexec/ssh-rand-helper
-man/man1/gsiscp.1
-man/man1/gsissh.1
-man/man1/scp.1
-man/man1/sftp.1
-man/man1/slogin.1
-man/man1/ssh.1
-man/man1/ssh-add.1
-man/man1/ssh-agent.1
-man/man1/ssh-keygen.1
-man/man1/ssh-keyscan.1
-man/man5/ssh_config.5
-man/man5/sshd_config.5
-man/man8/sftp-server.8
-man/man8/ssh-keysign.8
-man/man8/ssh-rand-helper.8
-man/man8/sshd.8
-man/cat1/gsiscp.1
-man/cat1/gsissh.1
-man/cat1/scp.1
-man/cat1/sftp.1
-man/cat1/slogin.1
-man/cat1/ssh.1
-man/cat1/ssh-add.1
-man/cat1/ssh-agent.1
-man/cat1/ssh-keygen.1
-man/cat1/ssh-keyscan.1
-man/cat5/ssh_config.5
-man/cat5/sshd_config.5
-man/cat8/sftp-server.8
-man/cat8/ssh-keysign.8
-man/cat8/ssh-rand-helper.8
-man/cat8/sshd.8
+man/ssh.d/man1/gsiscp.1
+man/ssh.d/man1/gsissh.1
+man/ssh.d/man1/scp.1
+man/ssh.d/man1/sftp.1
+man/ssh.d/man1/slogin.1
+man/ssh.d/man1/ssh.1
+man/ssh.d/man1/ssh-add.1
+man/ssh.d/man1/ssh-agent.1
+man/ssh.d/man1/ssh-keygen.1
+man/ssh.d/man1/ssh-keyscan.1
+man/ssh.d/man5/ssh_config.5
+man/ssh.d/man5/sshd_config.5
+man/ssh.d/man8/sftp-server.8
+man/ssh.d/man8/ssh-keysign.8
+man/ssh.d/man8/ssh-rand-helper.8
+man/ssh.d/man8/sshd.8
+man/ssh.d/cat1/gsiscp.1
+man/ssh.d/cat1/gsissh.1
+man/ssh.d/cat1/scp.1
+man/ssh.d/cat1/sftp.1
+man/ssh.d/cat1/slogin.1
+man/ssh.d/cat1/ssh.1
+man/ssh.d/cat1/ssh-add.1
+man/ssh.d/cat1/ssh-agent.1
+man/ssh.d/cat1/ssh-keygen.1
+man/ssh.d/cat1/ssh-keyscan.1
+man/ssh.d/cat5/ssh_config.5
+man/ssh.d/cat5/sshd_config.5
+man/ssh.d/cat8/sftp-server.8
+man/ssh.d/cat8/ssh-keysign.8
+man/ssh.d/cat8/ssh-rand-helper.8
+man/ssh.d/cat8/sshd.8
 sbin/sshd