Minor improvements in nt/INSTALL.MSYS instructions.

 nt/INSTALL.MSYS: mingw-get is not a GUI program (yet).
 msys-automake is not suitable for MinGW builds.  Mention the
 --enable-locallisppath switch to msysconfig.sh.  Suggested by
 ׃scar Fuentes <ofv@wanadoo.es>.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5ed4dd2388c9d080c1ac1c8e6751ca3b620f5d8e..d9aad787fce8d87cd32947495e451e829efdb6a3 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * INSTALL.MSYS: mingw-get is not a GUI program (yet).
+       msys-automake is not suitable for MinGW builds.  Mention the
+       --enable-locallisppath switch to msysconfig.sh.  Suggested by
+       Óscar Fuentes <ofv@wanadoo.es>.
+
 2013-06-07  Richard Copley  <rcopley@gmail.com>  (tiny change)
 
        * epaths.nt (PATH_SITELOADSEARCH): Fix commentary.

diff --git a/nt/INSTALL.MSYS b/nt/INSTALL.MSYS
index 56eb54c948c83d3c9fc828d2208f6f086f20cea6..c27e7e282b5b74b93ba6fa73d59e6860f66a7978 100644 (file)
--- a/nt/INSTALL.MSYS
+++ b/nt/INSTALL.MSYS
@@ -92,9 +92,9 @@ Windows 9X as well).
 
 ** Installing MinGW and MSYS using mingw-get
 
-  A nice GUI installer, called mingw-get, is available for those who
-  don't like to mess with manual installations.  You can download it
-  from here:
+  A nice installer, called mingw-get, is available for those who don't
+  like to mess with manual installations.  You can download it from
+  here:
 
     https://sourceforge.net/projects/mingw/files/Installer/mingw-get/
 
@@ -110,7 +110,6 @@ Windows 9X as well).
 
    . msys-base
    . mingw-developer-toolkit
-   . msys-automake
 
   (We recommend that you refrain from installing the MSYS Texinfo
   package, which is part of msys-base, because it might produce mixed
@@ -119,6 +118,11 @@ Windows 9X as well).
   MSYS Texinfo, after installing it as part of msys-base, invoke the
   command "mingw-get remove msys-texinfo".)
 
+  As the above packages don't include automake, you will need to
+  install it, e.g. from here:
+
+    http://sourceforge.net/projects/ezwinports/files/automake-1.11.6-msys-bin.zip/download
+
   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
@@ -188,11 +192,11 @@ Windows 9X as well).
 
   Each package might list other packages as prerequisites on its
   download page (under "Runtime requirements"); download those as
-  well.  (Using the GUI installer mingw-get will fetch those
-  prerequisites automatically for you.)  A missing prerequisite will
-  manifest itself by the program failing to run and presenting a
-  pop-up dialog that states the missing or incompatible DLL; be sure
-  to find and install these missing DLLs.
+  well.  (Using the mingw-get installer will fetch those prerequisites
+  automatically for you.)  A missing prerequisite will manifest itself
+  by the program failing to run and presenting a pop-up dialog that
+  states the missing or incompatible DLL; be sure to find and install
+  these missing DLLs.
 
   Once you think you have MinGW installed, test the installation by
   building a trivial "hello, world!" program, and make sure that it
@@ -228,8 +232,8 @@ Windows 9X as well).
      repository): Automake and Autoconf.  They are available from
      here:
 
-     http://sourceforge.net/projects/ezwinports/files/automake-1.11.6-msys-bin.zip/download
-     http://sourceforge.net/projects/ezwinports/files/autoconf-2.65-msys-bin.zip/download
+       http://sourceforge.net/projects/ezwinports/files/automake-1.11.6-msys-bin.zip/download
+       http://sourceforge.net/projects/ezwinports/files/autoconf-2.65-msys-bin.zip/download
 
   MSYS packages are distributed as .tar.lzma compressed archives.  To
   install the packages manually, we recommend to use the Windows port
@@ -256,11 +260,11 @@ Windows 9X as well).
 
   Each package might list other packages as prerequisites on its
   download page (under "Runtime requirements"); download those as
-  well.  (Using the GUI installer mingw-get will fetch those
-  prerequisites automatically for you.)  A missing prerequisite will
-  manifest itself by the program failing to run and presenting a
-  pop-up dialog that states the missing or incompatible DLL; be sure
-  to find and install these missing DLLs.
+  well.  (Using the mingw-get installer will fetch those prerequisites
+  automatically for you.)  A missing prerequisite will manifest itself
+  by the program failing to run and presenting a pop-up dialog that
+  states the missing or incompatible DLL; be sure to find and install
+  these missing DLLs.
 
   MSYS packages should be installed in a separate tree from MinGW.
   For example, use D:\MSYS or D:\usr\MSYS as the top-level directory
@@ -344,9 +348,9 @@ Windows 9X as well).
   Do NOT use Windows-style x:/foo/bar file names on the configure
   script command line; use the MSYS-style /x/foo/bar instead.  Using
   Windows-style file names was reported to cause subtle and hard to
-  figure out problems during the build.  This applies both to
-  --prefix= switch and the absolute file name of msysconfig.sh, if you
-  are building outside of the source tree.
+  figure out problems during the build.  This applies both to the
+  command switches, such as --prefix=, and to the absolute file name
+  of msysconfig.sh, if you are building outside of the source tree.
 
   You can pass additional options to the configure script, for the
   full list type
@@ -370,6 +374,19 @@ Windows 9X as well).
   to specify...  Perhaps you may wish to revisit your installation
   decisions now.
 
+  If you have a global site-lisp directory from previous Emacs
+  installation, and you want Emacs to continue using it, specify it
+  via the --enable-locallisppath switch to msysconfig.sh, like this:
+
+   ./nt/msysconfig.sh --prefix=PREFIX --enable-locallisppath="%emacs_dir%/share/emacs/VERSION/site-lisp;/d/wherever/site-lisp"
+
+  The %emacs_dir% part is the root of the Emacs installation tree, it
+  will get expanded by Emacs when it starts up.  Using %emacs_dir%,
+  you can add directories relative to your Emacs installation, which
+  will continue to be valid if you move the entire Emacs tree into
+  another place on your disk.  Use the normal MSYS /d/foo/bar style to
+  specify directories by their absolute file names.
+
   A few frequently used options are needed when you want to produce an
   unoptimized binary with runtime checks enabled: