Merge from origin/emacs-25

[gnu-emacs] / nt / INSTALL

diff --git a/nt/INSTALL b/nt/INSTALL
index 3bcb496cd5241a8ece6906df1c49ee42f26e84f2..99a2f3988f91ca744fa59ebe5f6273374fa1c4eb 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
                    Building and Installing Emacs on MS-Windows
                           using the MSYS and MinGW tools
 
-  Copyright (C) 2013-2015 Free Software Foundation, Inc.
+  Copyright (C) 2013-2016 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
 The MSYS/MinGW build described here is supported on versions of
@@ -12,6 +12,9 @@ build will run on Windows 9X and newer systems).
   Do not use this recipe with Cygwin.  For building on Cygwin, use the
   normal installation instructions, ../INSTALL.
 
+  For building Emacs using the MinGW64/MSYS2 toolchain, see the
+  instructions in the file INSTALL.W64 in this directory.
+
 * For the brave (a.k.a. "impatient"):
 
   For those who have a working MSYS/MinGW development environment and
@@ -178,6 +181,10 @@ build will run on Windows 9X and newer systems).
   command "mingw-get remove msys-texinfo", or mark "msys-texinfo" for
   removal in the mingw-get GUI, then select Installation->Apply Changes.)
 
+  (Similarly, we recommend to refrain from installing the MinGW
+  Automake and Autoconf packages; instead, install their MSYS builds
+  available from the ezwinports site, see below.)
+
   At this point, you should be ready to configure and build Emacs in
   its basic configuration.  Skip to the "Generating the configure
   script" section for the build instructions.  If you want to build it