Mise à jour de README.win

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10200 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 20 insertions, 74 deletions

diff --git a/INSTALL.win b/INSTALL.win
deleted file mode 100644
index a6ed9706c5..0000000000
--- a/INSTALL.win
+++ /dev/null
@@ -1,63 +0,0 @@
-**************************************************************
-* INSTALLATION PROCEDURE FOR THE COQ SYSTEM UNDER WINDOWS OS *
-**************************************************************
-
-    The binary distribution consists in a .zip archive file. This .zip contains
-long filenames and cannot therefore be unpacked with pkunzip version 2. Use
-either Winzip (shareware) or the Windows version of unzip (freeware):
-
-    http://www.winzip.com/
-    http://www.winimage.com/zLibDll/
-
-    Unzipping the distribution creates (among others) the following directories
-and files:
-
-    coq\bin\		The command-line tools
-    coq\lib\		The standard library files
-    coq\emacs		A Coq mode for your Emacs
-    coq\man\man1	The man pages for the command-line tools
-
-    There are two cases to consider :
-
-1. You unzip in the root of your drive (say C):
-===============================================
-
-    Hence Coq will be installed in C:\coq
-
-    You must add the C:\coq\bin path to your environment variable PATH. This is
-done by adding the following line to your AUTOEXEC.BAT:
-
-	set PATH=%PATH%;C:\coq\bin
-
-    You may also want to specify where Coq has to look for your configuration
-file .coqrc (not mandatory), e.g.:
-
-	set HOME=C:\My_Documents\Coq
-
-2. You unzip in some other place (say D:\My_Dir):
-=================================================
-
-    You must add the D:\My_Dir\coq\bin path to your environment variable PATH.
-This is done by adding the following line to AUTOEXEC.BAT:
-
-	set PATH=%PATH%;D:\My_Dir\coq\bin
-
-    You must also set the environment variables COQBIN and COQLIB to tell Coq
-that binaries and libraries are not in the default place. This is done by
-adding the following lines to your AUTOEXEC.BAT:
-
-	set COQBIN=D:\My_Dir\coq\bin
-	set COQLIB=D:\My_Dir\coq\lib
-
-    You may also want to specify where Coq has to look for your configuration
-file .coqrc (not mandatory), e.g.:
-
-	set HOME=C:\My_Documents\Coq
-
-PROBLEMS:
-=========
-
-    If you have any trouble with this installation, please contact:
-coq-bugs@pauillac.inria.fr.
-
-    The Coq Team.
diff --git a/README.win b/README.win
index ee64a54d9d..0e0a8de2f6 100644
--- a/README.win
+++ b/README.win
@@ -6,7 +6,12 @@ THE COQ V8.1 SYSTEM
 INSTALLATION.
 =============
 
-    See the file INSTALL.win for installation procedure.
+    The Coq package for Windows comes with an auto-installer. It will
+install Coq binaries and libraries under any directory you specify
+(C:\Program Files\Coq is the default path). It also creates shortcuts
+in the Windows menus. Alternatively, you can launch Coq using Coq.bat
+and Coqide.bat in the installation directory (C:\Program Files\Coq by
+default).
 
 COMPILATION.
 ============
@@ -15,29 +20,33 @@ COMPILATION.
     distribution. If you really need to recompile under Windows, here
     are some indications:
 
-    1- Install ocaml version 3.07 or later, Visual C++ (needed
-       for the -custom option of ocaml) and MASM (needed if you want
-       to produce a native version).
+    1- Install ocaml for Windows (MinGW port), preferably version 3.09.3.
+       See: http://caml.inria.fr
 
-    2- Install a complete set of Unix utilities (used by Makefiles). 
-       See: http://sources.redhat.com/cygwin/.
+    2- Install a shell environment with at least:
+         - a C compiler (gcc),
+         - the GNU make utility
 
-    3- Under cygwin, type successively
+       The Cygwin environment is well suited for compiling Coq
+       (official packages are made using Cygwin) See:
+       http://www.cygwin.com
+
+    3- In order to compile Coqide, you will need the LablGTK library
+       See: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
+
+    3- In a shell window, type successively
 
         ./configure
         make world
         make install
-        make clean
 
     4- Though not nescessary, you can find useful:
          - Windows version of (X)Emacs: it is a powerful environment for
            developpers with coloured syntax, modes for compilation and debug,
            and many more. It is free. See: http://www.gnu.org/software.
-         - Windows cvs client (very useful if you have access to the Coq
+         - Windows subversion client (very useful if you have access to the Coq
            archive).
 
-    If you are lost, you could find help at: coq-bugs@pauillac.inria.fr.
-
     Good luck :-)
 
     The Coq Team.