Merge from origin/emacs-25

[gnu-emacs] / nt / INSTALL

diff --git a/nt/INSTALL b/nt/INSTALL
index 759be326b19b37f6511e0f2ee215bfa52073d432..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
@@ -381,7 +388,12 @@ build will run on Windows 9X and newer systems).
      Checking for automake (need at least version 1.11)...
      ok
      Your system has the required tools, running autoreconf...
-     You can now run `./configure'.
+     Installing git hooks...
+     You can now run './configure'.
+
+  If the script fails because it cannot find Git, you will need to
+  arrange for the MSYS Bash's PATH to include the Git's 'bin'
+  subdirectory, where there's the git.exe executable.
 
 * Configuring Emacs for MinGW:
 
@@ -461,7 +473,7 @@ build will run on Windows 9X and newer systems).
   successful, will eventually produce a summary of the configuration
   similar to this:
 
-     Configured for `i686-pc-mingw32'.
+     Configured for 'i686-pc-mingw32'.
 
        Where should the build process find the source code?    /path/to/emacs/sources
        What compiler should emacs be built with?               gcc  -std=gnu99 -O0 -g3
@@ -619,10 +631,13 @@ build will run on Windows 9X and newer systems).
   is in the PATH or otherwise accessible and that the binaries are
   compatible (for example, that they were built with the same compiler).
 
+  To support XPM images (required for color tool-bar icons), you will
+  need the libXpm library.  It is available from the ezwinports site,
+  http://sourceforge.net/projects/ezwinports/files/.
+
   For PNG images, we recommend to use versions 1.4.x and later of
   libpng, because previous versions had security issues.  You can find
-  precompiled libraries and headers on the ezwinports site,
-  http://sourceforge.net/projects/ezwinports/files/.
+  precompiled libraries and headers on the ezwinports site.
 
   Versions 1.4.0 and later of libpng are binary incompatible with
   earlier versions, so Emacs will only look for libpng libraries which