Amélioration du README.doc et de l'installation de la doc

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

3 files changed, 15 insertions, 6 deletions

diff --git a/INSTALL.doc b/INSTALL.doc
index 3eb72e08b5..96918b49f9 100644
--- a/INSTALL.doc
+++ b/INSTALL.doc
@@ -33,6 +33,15 @@ To produce the html documents, the following tools are needed:
 
   - hevea (e.g. 1.07 works)
 
+
+Under Debian based operating systems (Debian, Ubuntu, ...) a
+working set of packages for compiling the documentation for Coq is:
+
+  texlive texlive-latex-extra texlive-math-extra texlive-fonts-extra
+  texlive-lang-french texlive-humanities texlive-pictures latex-xcolor
+  hevea netpbm
+
+
 Compilation
 -----------
 
@@ -75,7 +84,7 @@ To install all produced documents, do:
 
   make DOCDIR=/some/directory/for/documentation install-doc
 
-DOCDIR defauts to /usr/share/doc/coq-x.y were x.y is the version number
+DOCDIR defauts to /usr/share/doc/coq
 
 
 
diff --git a/configure b/configure
index 624f6cf1bc..9ae4f27977 100755
--- a/configure
+++ b/configure
@@ -689,7 +689,7 @@ case $ARCH in
 	 bindir_def=/usr/local/bin
 	 libdir_def=/usr/local/lib/coq
 	 mandir_def=/usr/local/man
-	 docdir_def=/usr/local/share/doc
+	 docdir_def=/usr/local/share/doc/coq
 	 emacslib_def=/usr/local/share/emacs/site-lisp
          coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;;
 esac
@@ -738,7 +738,7 @@ esac
 
 case $docdir_spec/$prefix_spec/$local in
     yes/*/*) DOCDIR=$docdir;;
-    */yes/*) DOCDIR=$prefix/share/doc ;;
+    */yes/*) DOCDIR=$prefix/share/doc/coq ;;
     */*/true) DOCDIR=$COQTOP/man ;;
     *)  echo "Where should I install the Coq documentation [$docdir_def] ?"
         read DOCDIR
@@ -840,7 +840,7 @@ echo "  Paths for true installation:"
 echo "    binaries      will be copied in $BINDIR"
 echo "    library       will be copied in $LIBDIR"
 echo "    man pages     will be copied in $MANDIR"
-echo "    documentation will be copied in $MANDIR"
+echo "    documentation will be copied in $DOCDIR"
 echo "    emacs mode    will be copied in $EMACSLIB"
 echo ""
 
diff --git a/tools/coqdoc/main.ml b/tools/coqdoc/main.ml
index add43b7c08..e6c3e5c071 100644
--- a/tools/coqdoc/main.ml
+++ b/tools/coqdoc/main.ml
@@ -439,13 +439,13 @@ let produce_document l =
   (if !target_language=HTML then
     let src = (Filename.concat !Cdglobals.coqlib_path "/tools/coqdoc/coqdoc.css") in
     let dst = if !output_dir <> "" then Filename.concat !output_dir "coqdoc.css" else "coqdoc.css" in
-      copy src dst);
+      if (Sys.file_exists src) then (copy src dst) else eprintf "Warning: file %s does not exist\n" src);
   (if !target_language=LaTeX then
       let src = (Filename.concat !Cdglobals.coqlib_path "/tools/coqdoc/coqdoc.sty") in
       let dst = if !output_dir <> "" then 
 	  Filename.concat !output_dir "coqdoc.sty" 
 	else "coqdoc.sty" in
-	copy src dst);
+	if Sys.file_exists src then copy src dst else eprintf "Warning: file %s does not exist\n" src);
   (match !Cdglobals.glob_source with
     | NoGlob -> ()
     | DotGlob -> ignore (List.map read_glob l)