support option -R pour coqdep

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

1 files changed, 5 insertions, 9 deletions

diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml
index 4b24cfd173..ee3acb5f4d 100644
--- a/scripts/coqmktop.ml
+++ b/scripts/coqmktop.ml
@@ -106,7 +106,7 @@ let files_to_link userfiles =
 (* Gives the list of all the directories under [dir].
    Uses [Unix] (it is hard to do without it). *)
 let all_subdirs dir =
-  let l = ref [] in
+  let l = ref [dir] in
   let add f = l := f :: !l in
   let rec traverse dir =
     let dirh = 
@@ -158,14 +158,10 @@ let parse_args () =
 	    | a :: rem -> parse (a::o::op,fl) rem
 	    | []       -> usage ()
 	end
-    | "-R" :: rem' ->
-        begin
-	  match rem' with
-	    | a :: rem ->
-                parse ((List.rev(List.flatten (List.map (fun d -> ["-I";d])
-						 (all_subdirs a))))@op,fl) rem
-	    | []       -> usage ()
-	end
+    | "-R" :: a :: rem ->
+        parse ((List.rev(List.flatten (List.map (fun d -> ["-I";d])
+					 (all_subdirs a))))@op,fl) rem
+    | "-R" :: [] -> usage ()
     | ("-compact"|"-g"|"-p" as o) :: rem -> parse (o::op,fl) rem
     | ("-h"|"--help") :: _ -> usage ()
     | f :: rem ->