From 8837c2365c382adb0a74bfedabb1659eeb472adc Mon Sep 17 00:00:00 2001 From: pboutill Date: Wed, 23 May 2012 14:41:24 +0000 Subject: Revert copy/pasted function in to minilib thanks to clib.cma git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15352 85f007b7-540e-0410-9357-904b9bb8a0f7 --- tools/coq_makefile.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/coq_makefile.ml') diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 20117ca6e..b9113c08e 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -111,7 +111,7 @@ let classify_files_by_root var files (inc_i,inc_r) = if not (List.exists (fun (pdir,_,_) -> pdir = ".") inc_r) then begin let absdir_of_files = List.rev_map - (fun x -> Minilib.canonical_path_name (Filename.dirname x)) + (fun x -> CUnix.canonical_path_name (Filename.dirname x)) files in (* files in scope of a -I option (assuming they are no overlapping) *) let has_inc_i = List.exists (fun (_,a) -> List.mem a absdir_of_files) inc_i in @@ -149,7 +149,7 @@ let install_include_by_root files_var files (inc_i,inc_r) = printf "\tdone\n" with Not_found -> let absdir_of_files = List.rev_map - (fun x -> Minilib.canonical_path_name (Filename.dirname x)) + (fun x -> CUnix.canonical_path_name (Filename.dirname x)) files in let has_inc_i_files = List.exists (fun (_,a) -> List.mem a absdir_of_files) inc_i in -- cgit v1.2.3