diff options
| author | letouzey | 2009-03-20 01:22:58 +0000 |
|---|---|---|
| committer | letouzey | 2009-03-20 01:22:58 +0000 |
| commit | 7d220f8b61649646692983872626d6a8042446a9 (patch) | |
| tree | fefceb2c59cf155c55fffa25ad08bec629de523e /tools | |
| parent | ad1fea78e3c23c903b2256d614756012d5f05d87 (diff) | |
Directory 'contrib' renamed into 'plugins', to end confusion with archive of user contribs
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11996 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml4 | 2 | ||||
| -rw-r--r-- | tools/coqdep.ml | 4 | ||||
| -rw-r--r-- | tools/coqdep_boot.ml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/coq_makefile.ml4 b/tools/coq_makefile.ml4 index 811a0db2ce..919aacbbe4 100644 --- a/tools/coq_makefile.ml4 +++ b/tools/coq_makefile.ml4 @@ -320,7 +320,7 @@ let include_dirs (inc_i,inc_r) = -I $(COQLIB)/proofs -I $(COQLIB)/tactics \\ -I $(COQLIB)/toplevel"; List.iter (fun c -> print " \\ - -I $(COQLIB)/contrib/"; print c) Coq_config.contrib_dirs; print "\n"; + -I $(COQLIB)/plugins/"; print c) Coq_config.plugins_dirs; print "\n"; print "COQLIBS:="; print_list "\\\n " str_i'; print " "; print_list "\\\n " str_r; print "\n"; print "COQDOCLIBS:="; print_list "\\\n " str_r; print "\n\n" diff --git a/tools/coqdep.ml b/tools/coqdep.ml index 07c8126f18..f6acd0b650 100644 --- a/tools/coqdep.ml +++ b/tools/coqdep.ml @@ -167,11 +167,11 @@ let coqdep () = if not Coq_config.has_natdynlink then option_natdynlk := false; if !Flags.boot then begin add_rec_dir add_known "theories" ["Coq"]; - add_rec_dir add_known "contrib" ["Coq"] + add_rec_dir add_known "plugins" ["Coq"] end else begin let coqlib = Envars.coqlib () in add_rec_dir add_coqlib_known (coqlib//"theories") ["Coq"]; - add_rec_dir add_coqlib_known (coqlib//"contrib") ["Coq"]; + add_rec_dir add_coqlib_known (coqlib//"plugins") ["Coq"]; add_dir add_coqlib_known (coqlib//"user-contrib") [] end; List.iter (fun (f,d) -> add_mli_known f d) !mliAccu; diff --git a/tools/coqdep_boot.ml b/tools/coqdep_boot.ml index 67113aa067..59fe701aab 100644 --- a/tools/coqdep_boot.ml +++ b/tools/coqdep_boot.ml @@ -12,8 +12,8 @@ open Coqdep_common (** [coqdep_boot] is a stripped-down version of [coqdep], whose behavior is the one of [coqdep -boot]. Its only dependencies - are [Coqdep_lexer] and [Unix], and it should stay so. - If it need someday some additional information, pass it via + are [Coqdep_lexer], [Coqdep_common] and [Unix], and it should stay so. + If it needs someday some additional information, pass it via options (see for instance [option_natdynlk] below). *) @@ -29,7 +29,7 @@ let coqdep_boot () = if Array.length Sys.argv < 2 then exit 1; parse (List.tl (Array.to_list Sys.argv)); add_rec_dir add_known "theories" ["Coq"]; - add_rec_dir add_known "contrib" ["Coq"]; + add_rec_dir add_known "plugins" ["Coq"]; List.iter (fun (f,d) -> add_mli_known f d) !mliAccu; List.iter (fun (f,d) -> add_mllib_known f d) !mllibAccu; List.iter (fun (f,_,d) -> add_ml_known f d) !mlAccu; |