o Add creation of a doc directory to the build-time and package-time

[gssapi-openssh.git] / openssh / Makefile.in

diff --git a/openssh/Makefile.in b/openssh/Makefile.in
index a0ada0fb0977544614a18df0f76ed292bff84e91..b9e9fa89e8aa3e214a0b4a6a42321ff0ae75395d 100644 (file)
--- a/openssh/Makefile.in
+++ b/openssh/Makefile.in
@@ -14,6 +14,7 @@ datadir=@datadir@
 mandir=@mandir@
 mansubdir=@mansubdir@
 sysconfdir=$$GLOBUS_LOCATION/etc/ssh
+docdir=$$GLOBUS_LOCATION/doc/gsi_openssh
 piddir=@piddir@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
@@ -49,6 +50,7 @@ EXEEXT=@EXEEXT@
 
 INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
+INSTALL_GSISSH=@INSTALL_GSISSH@
 
 @NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT)
 
@@ -250,14 +252,16 @@ 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
-       -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
+       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
@@ -290,24 +294,34 @@ install-files: scard-install
                echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
        fi
 
+#
+# gpt-install-files is install-files minus
+#   o copying the configuration files
+#   o copying the configuration file man pages
+#   o the scard-install target
+#   o creating and chmod'ing PRIVSEP_PATH
+#   o removing the conditionals around ssh-rand-helper*
+#   o install docs into $GL/doc/gsi_openssh
+#
+
 gpt-install-files:
        $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
        $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
-       $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh
+       $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
        $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
        $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
        $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent
        $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
        $(INSTALL) -m 0755 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan
        $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd
-       if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
-               $(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
-       fi
+       $(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
+       $(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 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
@@ -317,11 +331,20 @@ gpt-install-files:
        $(INSTALL) -m 644 ssh-keygen.1.out $(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.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
-       if [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
-               $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
-       fi
+       $(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
+       if [ ! -d $(DESTDIR)$(docdir) ]; then \
+               $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir); \
+       fi
+       $(INSTALL) -m 644 README $(DESTDIR)$(docdir)/README
+       $(INSTALL) -m 644 README.gpt $(DESTDIR)$(docdir)/README.gpt
+       $(INSTALL) -m 644 README.privsep $(DESTDIR)$(docdir)/README.privsep
+       $(INSTALL) -m 644 INSTALL $(DESTDIR)$(docdir)/INSTALL
+       $(INSTALL) -m 644 WARNING.RNG $(DESTDIR)$(docdir)/WARNING.RNG
+       $(INSTALL) -m 644 LICENCE $(DESTDIR)$(docdir)/LICENSE.OpenSSH
+       $(INSTALL) -m 644 CREDITS $(DESTDIR)$(docdir)/CREDITS
        -rm -f $(DESTDIR)$(bindir)/slogin
        ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
@@ -373,8 +396,10 @@ uninstallall:      uninstall
 
 uninstall: 
        -rm -f $(DESTDIR)$(bindir)/slogin
-       -rm -f $(DESTDIR)$(bindir)/gsiscp
-       -rm -f $(DESTDIR)$(bindir)/gsissh
+       if [ ! -z "$(INSTALL_GSISSH)" ]; then \
+               rm -f $(DESTDIR)$(bindir)/gsiscp; \
+               rm -f $(DESTDIR)$(bindir)/gsissh; \
+       fi
        -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
        -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
        -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
@@ -388,8 +413,10 @@ uninstall:
        -rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT)
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
-       -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.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/ssh-add.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1