o More cleanup of the gsi-openssh Makefile.

diff --git a/openssh/Makefile.in b/openssh/Makefile.in
index ef97d63ae655188a6d4bc504530b76bec551b3d3..5913addbc9e33e8550cc21319f8fed11576f6890 100644 (file)
--- a/openssh/Makefile.in
+++ b/openssh/Makefile.in
@@ -254,16 +254,6 @@ install-files: scard-install
        ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
        ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-       if [ ! -z "$(INSTALL_GSISSH)" ]; then \
-               rm -f $(DESTDIR)$(bindir)/gsissh; \
-               ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/gsissh; \
-               rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
-               ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
-               rm -f $(DESTDIR)$(bindir)/gsiscp; \
-               ln -s ./scp$(EXEEXT) $(DESTDIR)$(bindir)/gsiscp; \
-               rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
-               ln -s ./scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
-       fi
        if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
        fi
@@ -337,49 +327,52 @@ gpt-install-files:
        $(INSTALL) -m 4711 -s ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
        @NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp
        @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER)
-       $(INSTALL) -m 644 man/ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
-       $(INSTALL) -m 644 man/scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-       $(INSTALL) -m 644 man/ssh-add.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
-       $(INSTALL) -m 644 man/ssh-agent.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
-       $(INSTALL) -m 644 man/ssh-keygen.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
-       $(INSTALL) -m 644 man/ssh-keyscan.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
-       $(INSTALL) -m 644 man/sshd_config.5 $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
-       $(INSTALL) -m 644 man/ssh_config.5 $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
-       $(INSTALL) -m 644 man/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
-       $(INSTALL) -m 644 man/ssh-rand-helper.8 $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
-       @NO_SFTP@$(INSTALL) -m 644 man/sftp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
-       @NO_SFTP@$(INSTALL) -m 644 man/sftp-server.8 $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
-       -rm -f $(DESTDIR)man/$(man)1/slogin.1
-       ln -s $(DESTDIR)/man/$(man)1/ssh.1 $(DESTDIR)man/man1/slogin.1
-
-       $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
-       $(INSTALL) -m 644 man/ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
-       $(INSTALL) -m 644 man/scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-       $(INSTALL) -m 644 ssh-add.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
-       $(INSTALL) -m 644 ssh-agent.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
-       $(INSTALL) -m 644 ssh-keygen.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
-       $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
-       $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
-       $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
-       $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
-       $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
-       @NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
-       @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
-       $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
        -rm -f $(DESTDIR)$(bindir)/slogin
        ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
+       -rm -f $(DESTDIR)$(bindir)/gsissh
+       ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/gsissh
+       -rm -f $(DESTDIR)$(bindir)/gsiscp
+       ln -s ./scp$(EXEEXT) $(DESTDIR)$(bindir)/gsiscp
+       mansubdir=man
+       $(INSTALL) -m 644 $(mansubdir)/ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
+       $(INSTALL) -m 644 $(mansubdir)/scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-add.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-agent.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-keygen.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-keyscan.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
+       $(INSTALL) -m 644 $(mansubdir)/sshd_config.5 $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
+       $(INSTALL) -m 644 $(mansubdir)/ssh_config.5 $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
+       $(INSTALL) -m 644 $(mansubdir)/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
+       $(INSTALL) -m 644 $(mansubdir)/ssh-rand-helper.8 $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8
+       @NO_SFTP@$(INSTALL) -m 644 $(mansubdir)/sftp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
+       @NO_SFTP@$(INSTALL) -m 644 $(mansubdir)/sftp-server.8 $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
+       $(INSTALL) -m 644 $(mansubdir)/ssh-keysign.8 $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
        ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-       if [ ! -z "$(INSTALL_GSISSH)" ]; then \
-               rm -f $(DESTDIR)$(bindir)/gsissh; \
-               ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/gsissh; \
-               rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
-               ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
-               rm -f $(DESTDIR)$(bindir)/gsiscp; \
-               ln -s ./scp$(EXEEXT) $(DESTDIR)$(bindir)/gsiscp; \
-               rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
-               ln -s ./scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
-       fi
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
+       ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
+       ln -s ./scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
+       mansubdir=cat
+       $(INSTALL) -m 644 $(mansubdir)/ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
+       $(INSTALL) -m 644 $(mansubdir)/scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-add.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-agent.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-keygen.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
+       $(INSTALL) -m 644 $(mansubdir)/ssh-keyscan.1 $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
+       $(INSTALL) -m 644 $(mansubdir)/sshd_config.5 $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
+       $(INSTALL) -m 644 $(mansubdir)/ssh_config.5 $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
+       $(INSTALL) -m 644 $(mansubdir)/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
+       $(INSTALL) -m 644 $(mansubdir)/ssh-rand-helper.8 $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8
+       @NO_SFTP@$(INSTALL) -m 644 $(mansubdir)/sftp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
+       @NO_SFTP@$(INSTALL) -m 644 $(mansubdir)/sftp-server.8 $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
+       $(INSTALL) -m 644 $(mansubdir)/ssh-keysign.8 $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+       ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
+       ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
+       ln -s ./scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
        if [ ! -d $(DESTDIR)$(docdir) ]; then \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir); \
        fi
@@ -429,10 +422,8 @@ uninstallall:      uninstall
 
 uninstall: 
        -rm -f $(DESTDIR)$(bindir)/slogin
-       if [ ! -z "$(INSTALL_GSISSH)" ]; then \
-               rm -f $(DESTDIR)$(bindir)/gsiscp; \
-               rm -f $(DESTDIR)$(bindir)/gsissh; \
-       fi
+       -rm -f $(DESTDIR)$(bindir)/gsiscp
+       -rm -f $(DESTDIR)$(bindir)/gsissh
        -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
        -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
        -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
@@ -446,10 +437,8 @@ uninstall:
        -rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT)
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-       if [ ! -z "$(INSTALL_GSISSH)" ]; then \
-               rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
-               rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
-       fi
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
+       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1

diff --git a/openssh/filelist b/openssh/filelist
index dd942e58dd6eb5b93395551ecfebec2e03346447..46e427b668a88f06cc357cc7ca25a3b2e0f22d89 100644 (file)
--- a/openssh/filelist
+++ b/openssh/filelist
@@ -32,4 +32,18 @@ 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/cat8/sftp-server.8
+man/cat8/ssh-keysign.8
+man/cat8/ssh-rand-helper.8
+man/cat8/sshd.8
 sbin/sshd