From 73ac958a49e54f2bedcac7f8557537e0bf524068 Mon Sep 17 00:00:00 2001
From: Daniel R. Grayson
Date: Mon, 26 Jan 2015 20:56:45 -0600
Subject: Allow -type-in-type to be an option also for coqc.

---
 tools/coqc.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/coqc.ml b/tools/coqc.ml
index f636ffd87a..5c7be41bec 100644
--- a/tools/coqc.ml
+++ b/tools/coqc.ml
@@ -111,7 +111,7 @@ let parse_args () =
       |"-dont-load-proofs"|"-load-proofs"|"-force-load-proofs"
       |"-impredicative-set"|"-vm"|"-no-native-compiler"
       |"-verbose-compat-notations"|"-no-compat-notations"
-      |"-indices-matter"|"-quick"|"-color"
+      |"-indices-matter"|"-quick"|"-color"|"-type-in-type"
       |"-async-proofs-always-delegate"|"-async-proofs-never-reopen-branch"
       as o) :: rem ->
 	parse (cfiles,o::args) rem
-- 
cgit v1.2.3


From 0ff6b07d67560dc46b8becf4780ce1283cbece4e Mon Sep 17 00:00:00 2001
From: Pierre Courtieu
Date: Tue, 27 Jan 2015 17:28:27 +0100
Subject: Fixed a wrong warning in coq_makefile.

A non empty dir detected as an empty one.
---
 tools/coq_makefile.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index d660f4205d..5213d38e71 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -750,7 +750,7 @@ let ensure_root_dir (v,(mli,ml4,ml,mllib,mlpack),_,_) ((ml_inc,i_inc,r_inc) as l
 
 let warn_install_at_root_directory
     (vfiles,(mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles),_,_) (inc_ml,inc_i,inc_r) =
-  let inc_top = List.filter (fun (_,ldir,_) -> ldir = "") inc_r@inc_i in
+  let inc_top = List.filter (fun (_,ldir,_) -> ldir = "") (inc_r@inc_i) in
   let inc_top_p = List.map (fun (p,_,_) -> p) inc_top in
   let files = vfiles @ mlifiles @ ml4files @ mlfiles @ mllibfiles @ mlpackfiles in
   if List.exists (fun f -> List.mem (Filename.dirname f) inc_top_p) files
-- 
cgit v1.2.3