; * nt/INSTALL.W64: Fix wording.

This commit is contained in:
Eli Zaretskii 2022-12-25 10:26:59 +02:00
parent ecee3bd420
commit 2cec78254e

View file

@ -31,7 +31,7 @@ build tools for MinGW-w64 -- see https://msys2.org/.
** Download and install MinGW-w64 and MSYS2 ** Download and install MinGW-w64 and MSYS2
Go to https://msys2.org and follow the instructions. It is not Go to https://msys2.org and follow the instructions. It is not
necessary to install the packages suggested on those instructions. necessary to install the packages suggested on those instructions.
** Download and install the necessary packages ** Download and install the necessary packages
@ -70,9 +70,9 @@ You now have a complete build environment for Emacs.
* Install Git (optional) and disable autocrlf * Install Git (optional) and disable autocrlf
If you're going to be building the development version of Emacs from the Git If you're going to be building the development version of Emacs from
repository, and you don't already have Git on your system, you can install it the Git repository (see below), and you don't already have Git on your
in your MSYS2 environment with: system, you can install it in your MSYS2 environment with:
pacman -S git pacman -S git
@ -95,19 +95,22 @@ Savannah Emacs site, https://savannah.gnu.org/projects/emacs.
The Emacs ftp site is located at https://ftp.gnu.org/gnu/emacs/ - download the The Emacs ftp site is located at https://ftp.gnu.org/gnu/emacs/ - download the
version you want to build and put the file into a location like C:\emacs\, version you want to build and put the file into a location like C:\emacs\,
then uncompress it with tar. This will put the Emacs source into a folder like then uncompress it with tar. This will put the Emacs source into a folder like
C:\emacs\emacs-24.5: C:\emacs\emacs-29.1:
cd /c/emacs cd /c/emacs
tar xJf emacs-24.5.tar.xz tar xJf emacs-29.1.tar.xz
** From the Git repository ** From the Git repository
To download the Git repository, do something like the following -- this will To clone the Git repository, do something like the following -- this will
put the Emacs source into C:\emacs\emacs-26: put the Emacs source into C:\emacs\emacs-master:
mkdir /c/emacs mkdir /c/emacs
cd /c/emacs cd /c/emacs
git clone git://git.sv.gnu.org/emacs.git emacs-26 git clone git://git.sv.gnu.org/emacs.git emacs-master
This will produce the development sources, i.e. the master branch of
the Emacs Git repository, in the directory C:\emacs\emacs-master.
(We recommend using the command shown on Savannah Emacs project page.) (We recommend using the command shown on Savannah Emacs project page.)
@ -116,11 +119,12 @@ put the Emacs source into C:\emacs\emacs-26:
Now you're ready to build and install Emacs with autogen, configure, make, Now you're ready to build and install Emacs with autogen, configure, make,
and make install. and make install.
cd /c/emacs/emacs-26 cd /c/emacs/emacs-29.1 (if building a source tarball)
cd /c/emacs/emacs-master (if building from Git)
** Run autogen ** Run autogen
If you are building the development sources, run autogen to generate the If you are building from Git, run autogen to generate the
configure script (note: this step is not necessary if you are using a configure script (note: this step is not necessary if you are using a
release source tarball, as the configure file is included): release source tarball, as the configure file is included):
@ -132,15 +136,16 @@ Now you can run configure, which will build the various Makefiles -- note
that the example given here is just a simple one - for more information 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. on the options available please see the INSTALL file in this directory.
The '--prefix' option specifies a location for the resulting binary files, The '--prefix' option specifies a location for the resulting binary
which 'make install' will use - in this example we set it to C:\emacs\emacs-26. files, which 'make install' will use - in this example we set it to
If a prefix is not specified the files will be put in the standard Unix C:\programs\emacs. If a prefix is not specified the files will be put
directories located in your C:\msys64 directory, but this is not recommended. in the standard Unix directories located in your C:\msys64 directory,
but this is not recommended.
Note also that we need to disable D-Bus because Emacs does not yet Note also that we need to disable D-Bus because Emacs does not yet
support them on Windows. support them on Windows.
./configure --prefix=/c/emacs/emacs-26 --without-dbus ./configure --prefix=/c/programs/emacs --without-dbus
** Run make ** Run make