Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org

[bpt/emacs.git] / nt / INSTALL

diff --git a/nt/INSTALL b/nt/INSTALL
index 103f860..e3d7dd0 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -44,7 +44,7 @@ Windows 9X as well).
      It is always preferable to use --prefix to configure Emacs for
      some specific location of its installed tree; the default
      /usr/local is not suitable for Windows (see the detailed
-     instructions for the reasons).
+     instructions for the reasons).  The prefix must be absolute.
 
      You can pass other options to the configure script.  Here's a
      typical example (for an in-place debug build):
@@ -122,7 +122,7 @@ Windows 9X as well).
   optional libraries near the end of this document, before you start
   the build.  Also, consider installing additional MinGW packages that
   are required/recommended, especially if you are building from the
-  Bazaar repository, as described in the next section.
+  repository, as described in the next section.
 
 ** Installing MinGW and MSYS manually
 
@@ -166,7 +166,7 @@ Windows 9X as well).
   been warned!
 
   Additional MinGW packages are required/recommended, especially if
-  you are building from the Bazaar repository:
+  you are building from the repository:
 
    . Texinfo (needed to produce the Info manuals when building from
      bzr, and for "make install")
@@ -218,9 +218,9 @@ Windows 9X as well).
       - mktemp
 
      These should only be needed if you intend to build development
-     versions of Emacs from the Bazaar repository.
+     versions of Emacs from the repository.
 
-   . Additional packages (needed only if building from the Bazaar
+   . Additional packages (needed only if building from the
      repository): Automake and Autoconf.  They are available from
      here:
 
@@ -279,7 +279,7 @@ Windows 9X as well).
   If you are building a release or pretest tarball, skip this section,
   because the configure script is already present in the tarball.
 
-  To build a development snapshot from the Emacs Bazaar repository,
+  To build a development snapshot from the Emacs repository,
   you will first need to generate the configure script and a few other
   auto-generated files.
 
@@ -292,7 +292,7 @@ Windows 9X as well).
 
      $ ./autogen.sh
      Checking whether you have the necessary tools...
-     (Read INSTALL.BZR for more details on building Emacs)
+     (Read INSTALL.REPO for more details on building Emacs)
 
      Checking for autoconf (need at least version 2.65)...
      ok
@@ -449,7 +449,7 @@ Windows 9X as well).
 * Make targets
 
   The following make targets may be used by users building the source
-  distribution, or users who have checked out of Bazaar after
+  distribution, or users who have checked out of the repository after
   an initial bootstrapping.
 
   make
@@ -471,7 +471,8 @@ Windows 9X as well).
   necessary to run the configure script followed by "make", in order
   to rebuild.
 
-  The following targets are intended only for use with the Bazaar sources.
+  The following targets are intended only for use with the repository
+  sources.
 
   make bootstrap
   Removes all the auto-generated files and all the *.elc byte-compiled
@@ -481,7 +482,7 @@ Windows 9X as well).
 
   make maintainer-clean
   Removes everything that can be recreated, including compiled Lisp
-  files, to get back to the state of a fresh Bazaar tree.  After make
+  files, to get back to the state of a fresh repository tree.  After make
   maintainer-clean, it is necessary to run configure and "make" or
   "make bootstrap" to rebuild.  Occasionally it may be necessary to
   run this target after an update.
@@ -567,6 +568,14 @@ Windows 9X as well).
   libraries that are known to be compatible with the version given by
   `libgif-version'.
 
+  For JPEG images, you will need libjpeg 6b or later, which will be
+  called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll.  You can
+  find these on the ezwinports site.
+
+  TIFF images require libTIFF 3.0 or later, which will be called
+  libtiffN.dll or libtiff-N.dll or libtiff.dll.  These can be found on
+  the ezwinports site.
+
   Pre-built versions of librsvg and its dependencies can be found in
   one of these places: