openssh unix dev - Dec 2009 - [PATCH] contrib/cygwin/Makefile: Install ssh-copy-id

Hi,

could somebody with checkin rights please apply the below patch
to the Cygwin postinstall Makefile?  The patch adds two changes:

- Install ssh-copy-id and ssh-copy-id.1 as well.
- Gzip all man pages.


Thanks in advance,
Corinna


Index: contrib/cygwin/Makefile
==================================================================RCS file:
/cvs/openssh/contrib/cygwin/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- contrib/cygwin/Makefile	1 Dec 2008 10:34:28 -0000	1.4
+++ contrib/cygwin/Makefile	17 Dec 2009 09:44:39 -0000
@@ -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-use
 	$(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."


-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat

On Thu, 17 Dec 2009, Corinna Vinschen wrote:
> Hi,
> 
> could somebody with checkin rights please apply the below patch
> to the Cygwin postinstall Makefile?  The patch adds two changes:
> 
> - Install ssh-copy-id and ssh-copy-id.1 as well.
> - Gzip all man pages.
Patch applied.


-- 
Tim Rice				Multitalents
tim at multitalents.net