merge version/4.00 at revision 12866

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12869 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

INSTALL

@@ -43,18 +43,21 @@ in the config/ subdirectory.
 
 The "configure" script accepts the following options:
 
--bindir <dir>                   (default: /usr/local/bin)
-        Directory where the binaries will be installed
+-prefix <dir>                   (default: /usr/local)
+        Set the PREFIX variable used to define the defaults of the
+        following three options.  Must be an absolute path name.
 
--libdir <dir>                   (default: /usr/local/lib/ocaml)
-        Directory where the Caml library will be installed
+-bindir <dir>                   (default: $(PREFIX)/bin)
+        Directory where the binaries will be installed.
+        Must be an absolute path name, or start with "$(PREFIX)"
 
--mandir <dir>                   (default: /usr/local/man/man1)
-        Directory where the manual pages will be installed
+-libdir <dir>                   (default: $(PREFIX)/lib/ocaml)
+        Directory where the OCaml library will be installed
+        Must be an absolute path name, or start with "$(PREFIX)"
 
--prefix <dir>                   (default: /usr/local)
-        Set bindir, libdir and mandir to
-        <dir>/bin, <dir>/lib/ocaml, <dir>/man/man1 respectively.
+-mandir <dir>                   (default: $(PREFIX)/man/man1)
+        Directory where the manual pages will be installed
+        Must be an absolute path name, or start with "$(PREFIX)"
 
 -cc <C compiler and options>    (default: gcc if available, cc otherwise)
         C compiler to use for building the system
@@ -67,10 +70,11 @@ The "configure" script accepts the following options:
 
 -host <hosttype>                (default: determined automatically)
         The type of the host machine, in GNU's "configuration name"
-        format (CPU-COMPANY-SYSTEM). This info is generally determined
-        automatically by the "configure" script, and rarely ever
-        needs to be provided by hand. The installation instructions
-        for gcc or emacs contain a complete list of configuration names.
+        format (CPU-COMPANY-SYSTEM or CPU-COMPANY-KERNEL-SYSTEM).
+        This info is generally determined automatically by the
+        "configure" script, and rarely ever needs to be provided by
+        hand. The installation instructions for gcc or emacs contain a
+        complete list of configuration names.
 
 -x11include <include_dir>       (default: determined automatically)
 -x11lib     <lib_dir>           (default: determined automatically)
@@ -127,13 +131,25 @@ The "configure" script accepts the following options:
         Verbose output of the configuration tests. Use it if the outcome
         of configure is not what you were expecting.
 
+-no-camlp4
+        Do not compile Camlp4.
+
+-no-graph
+        Do not compile the Graphics library.
+
+-partialld <linker and options>  (default: determined automatically)
+        The linker and options to use for producing an object file
+        (rather than an executable) from several other object files.
+
 Examples:
 
   Standard installation in /usr/{bin,lib,man} instead of /usr/local:
     ./configure -prefix /usr
 
   Installation in /usr, man pages in section "l":
     ./configure -bindir /usr/bin -libdir /usr/lib/ocaml -mandir /usr/man/manl
+  or:
+    ./configure -prefix /usr -mandir '$(PREFIX)/man/manl'
 
   On a MacOSX 10.5/Intel Core 2 or MacOSX 10.5/PowerPC host,
   to build a 64-bit version of OCaml:
@@ -146,13 +162,16 @@ Examples:
     ./configure -cc "gcc -m32" -as "as --32" -aspp "gcc -m32 -c"
 
   On a Linux x86/64 bits host, to build the run-time system in PIC mode
-  (enables putting the runtime in a shared library, 
+  (enables putting the runtime in a shared library,
    at a small performance cost):
     ./configure -cc "gcc -fPIC" -aspp "gcc -c -fPIC"
 
   For Sun Solaris with the "acc" compiler:
     ./configure -cc "acc -fast" -libs "-lucb"
 
+  For Sun Solaris on Sparc 64bit, to compile natively (32bit only)
+    ./configure -cc "gcc -m32" -as "as -32" -aspp "gcc -m32 -c"
+
   For AIX 4.3 with the IBM compiler xlc:
     ./configure -cc "xlc_r -D_AIX43 -Wl,-bexpall,-brtl -qmaxmem=8192"
 
@@ -237,9 +256,9 @@ autoconfiguration):
         ocamllex         the lexer generator
         ocaml            the interactive, toplevel-based system
         ocamlmktop       a tool to make toplevel systems that integrate
-                         user-defined C primitives and Caml code
+                         user-defined C primitives and OCaml code
         ocamldebug       the source-level replay debugger
-        ocamldep         generator of "make" dependencies for Caml sources
+        ocamldep         generator of "make" dependencies for OCaml sources
         ocamldoc         documentation generator
         ocamlprof        execution count profiler
         ocamlcp          the bytecode compiler in profiling mode
@@ -271,7 +290,7 @@ In the latter case, the destination directory defaults to the
 
 9- After installation, do *not* strip the ocamldebug and ocamlbrowser
 executables.  (These are mixed-mode executables, containing both
-compiled C code and Caml bytecode; stripping erases the bytecode!)
+compiled C code and OCaml bytecode; stripping erases the bytecode!)
 Other executables such as ocamlrun can safely be stripped.
 
 IF SOMETHING GOES WRONG: