- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

   Gzip all man pages. Patch from Corinna Vinschen.

diff --git a/ChangeLog b/ChangeLog
index 677a6af1ed0f69feea7934f055fe4f36106742ea..dec86124595297b1bbc7cee117e9220b9f856d04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20091226
+ - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
+   Gzip all man pages. Patch from Corinna Vinschen.
+
 20091221
  - (dtucker) [auth-krb5.c platform.{c,h} openbsd-compat/port-aix.{c,h}]
    Bug #1583: Use system's kerberos principal name on AIX if it's available.

diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile
index 2ebd143dcdf93482e097425093e795dbf7f6e504..9f680c16cc24a7baf66a4f8d650b7d6dee56f012 100644 (file)
--- a/contrib/cygwin/Makefile
+++ b/contrib/cygwin/Makefile
@@ -1,8 +1,10 @@
 srcdir=../..
+copyidsrcdir=..
 prefix=/usr
 exec_prefix=$(prefix)
 bindir=$(prefix)/bin
 datadir=$(prefix)/share
+mandir=$(datadir)/man
 docdir=$(datadir)/doc
 sshdocdir=$(docdir)/openssh
 cygdocdir=$(docdir)/Cygwin
@@ -59,5 +61,16 @@ install-scripts: ssh-host-config ssh-user-config
        $(INSTALL) -m 755 ssh-host-config $(DESTDIR)$(bindir)/ssh-host-config
        $(INSTALL) -m 755 ssh-user-config $(DESTDIR)$(bindir)/ssh-user-config
 
-cygwin-postinstall: move-config-files remove-empty-dir install-inetd-config install-doc install-scripts
+install-copy-id: $(copyidsrcdir)/ssh-copy-id $(copyidsrcdir)/ssh-copy-id.1
+       $(INSTALL) -m 755 $(copyidsrcdir)/ssh-copy-id $(DESTDIR)$(bindir)/ssh-copy-id
+       $(INSTALL) -m 644 $(copyidsrcdir)/ssh-copy-id.1 $(DESTDIR)$(mandir)/man1/ssh-copy-id.1
+
+gzip-man-pages:
+       rm $(DESTDIR)$(mandir)/man1/slogin.1
+       gzip $(DESTDIR)$(mandir)/man1/*.1
+       gzip $(DESTDIR)$(mandir)/man5/*.5
+       gzip $(DESTDIR)$(mandir)/man8/*.8
+       cd $(DESTDIR)$(mandir)/man1 && ln -s ssh.1.gz slogin.1.gz
+
+cygwin-postinstall: move-config-files remove-empty-dir install-inetd-config install-doc install-scripts install-copy-id gzip-man-pages
        @echo "Cygwin specific configuration finished."