From 94b490529a85ea0844f2e1cf0dc7d2284c2ff2f2 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 3 Nov 2017 12:06:07 -0500 Subject: [PATCH] * nt/INSTALL.W64: Update to current mingw64 install instructions --- nt/INSTALL.W64 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 index 841660bf0f9..71864ce8c26 100644 --- a/nt/INSTALL.W64 +++ b/nt/INSTALL.W64 @@ -49,13 +49,13 @@ will also be available at the Windows console. ** Download and install the necessary packages -Run msys2_shell.bat in your MSYS2 directory and you will see a BASH window +Run c:/msys64/msys2.exe in your MSYS2 directory and you will see a BASH window opened. In the BASH prompt, use the following command to install the necessary packages (you can copy and paste it into the shell with Shift + Insert): - pacman -S base-devel \ + pacman -S --needed base-devel \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-xpm-nox \ mingw-w64-x86_64-libtiff \ @@ -63,7 +63,7 @@ packages (you can copy and paste it into the shell with Shift + Insert): mingw-w64-x86_64-libpng \ mingw-w64-x86_64-libjpeg-turbo \ mingw-w64-x86_64-librsvg \ - mingw-w64-x86_64-liblcms2 \ + mingw-w64-x86_64-lcms2 \ mingw-w64-x86_64-libxml2 \ mingw-w64-x86_64-gnutls \ mingw-w64-x86_64-zlib @@ -126,10 +126,10 @@ Now you're ready to build and install Emacs with autogen, configure, make, and make install. First we need to switch to the MinGW-w64 environment. Exit the MSYS2 BASH -console and run mingw64_shell.bat in the C:\msys64 folder, then cd back to +console and run mingw64.exe in the C:\msys64 folder, then cd back to your Emacs source directory, e.g.: - cd /c/emacs/emacs-25 + cd /c/emacs/emacs-26 ** Run autogen @@ -146,7 +146,7 @@ that the example given here is just a simple one - for more information on the options available please see the INSTALL file in this directory. The '--prefix' option specifies a location for the resulting binary files, -which 'make install' will use - in this example we set it to C:\emacs\emacs-25. +which 'make install' will use - in this example we set it to C:\emacs\emacs-26. If a prefix is not specified the files will be put in the standard Unix directories located in your C:\msys64 directory, but this is not recommended. @@ -154,7 +154,7 @@ Note also that we need to disable Imagemagick because Emacs does not yet support it on Windows. PKG_CONFIG_PATH=/mingw64/lib/pkgconfig \ - ./configure --prefix=/c/emacs/emacs-25 --without-imagemagick + ./configure --prefix=/c/emacs/emacs-26 --without-imagemagick ** Run make