Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270

2 files changed, 6 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4a8f353782b..c0d8d7a5050 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-18  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (install): Install COPYING in top-level and bin dirs.
+
 2007-09-27  Jason Rumney  <jasonr@gnu.org>
 
         * gmake.defs (COMCTL32): New system library.
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 155f201aa1e..5cb13a79e9a 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -211,6 +211,8 @@ install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
         $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF)

         - $(CP_DIR) icons $(INSTALL_DIR)/etc

         $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF)

+        $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF)

+        - $(CP) ../COPYING $(INSTALL_DIR)/bin

         - $(DEL) ../same-dir.tst

         - $(DEL) $(INSTALL_DIR)/same-dir.tst