- (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong

   ones.  Based on a patch from Roumen Petrov.

diff --git a/ChangeLog b/ChangeLog
index 7e662faabd4adb479ca4cd040098df1421dae15d..12842f785696eb39abfae78567f0fb9a254602de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20100409
+ - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong
+   ones.  Based on a patch from Roumen Petrov.
+
 20100326
  - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection
    for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson

diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile
index fe3ae0bbd0af6363b8166a86b6af8e550e1b526e..dc857f2edb6b59915c44b8a61a873bbd03f92558 100644 (file)
--- a/contrib/cygwin/Makefile
+++ b/contrib/cygwin/Makefile
@@ -42,13 +42,13 @@ install-sshdoc:
        $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW
        $(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL
        $(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent
-       $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.agent
-       $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.agent
+       $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.certkeys
+       $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.mux
        $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README
        $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns
        $(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform
        $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep
-       $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.privsep
+       $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.tun
        $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO
        $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG