diff options
| author |  notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-03-08 03:06:18 +0000 |
|---|---|---|
| committer | notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-03-08 03:06:18 +0000 |
| commit | 16ae29315ae0f88c4926b97f8fe22bffe65aa3e1 (patch) | |
| tree | d46f077c4919df5868c11ae05126aba728c6c8d2 | |
| parent | 11bf7edb003eda8f8f5f0adcd215e7eeb9d80303 (diff) | |
Coq_makefile : backtrack sur les liens vers les exécutables ocaml
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10638 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | tools/coq_makefile.ml4 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/coq_makefile.ml4 b/tools/coq_makefile.ml4 index 9cbf4670a..8e3e0aa45 100644 --- a/tools/coq_makefile.ml4 +++ b/tools/coq_makefile.ml4 @@ -168,8 +168,8 @@ let variables l = | _ :: r -> var_aux r in section "Variables definitions."; - printf "CAMLP4LIB:=%s\n" Coq_config.camlp4lib; - printf "CAMLP4:=%s\n" (Filename.concat Coq_config.camldir Coq_config.camlp4); + print "CAMLP4LIB:=$(shell $(CAMLBIN)camlp5 -where 2> /dev/null || $(CAMLBIN)camlp4 -where)\n"; + print "CAMLP4:=$(notdir $(CAMLP4LIB))\n"; print "COQSRC:=-I $(COQTOP)/kernel -I $(COQTOP)/lib \\ -I $(COQTOP)/library -I $(COQTOP)/parsing \\ -I $(COQTOP)/pretyping -I $(COQTOP)/interp \\ @@ -194,13 +194,13 @@ let variables l = print "GALLINA:=$(COQBIN)gallina\n"; print "COQDOC:=$(COQBIN)coqdoc\n"; (* Caml executables and relative variables *) - printf "CAMLC:=%s/ocamlc -rectypes -c\n" Coq_config.camldir; - printf "CAMLOPTC:=%s/ocamlopt -c\n" Coq_config.camldir; - printf "CAMLLINK:=%s/ocamlc\n" Coq_config.camldir; - printf "CAMLOPTLINK:=%s/ocamlopt\n" Coq_config.camldir; + printf "CAMLC:=$(CAMLBIN)ocamlc -rectypes -c\n"; + printf "CAMLOPTC:=$(CAMLBIN)ocamlopt -c\n"; + printf "CAMLLINK:=$(CAMLBIN)ocamlc\n"; + printf "CAMLOPTLINK:=$(CAMLBIN)ocamlopt\n"; print "GRAMMARS:=grammar.cma\n"; print "CAMLP4EXTEND:=pa_extend.cmo pa_macro.cmo q_MLast.cmo\n"; - print "PP:=-pp \"$(CAMLP4)o -I . -I $(COQTOP)/parsing $(CAMLP4EXTEND) $(GRAMMARS) -impl\"\n"; + print "PP:=-pp \"$(CAMLBIN)$(CAMLP4)o -I . -I $(COQTOP)/parsing $(CAMLP4EXTEND) $(GRAMMARS) -impl\"\n"; var_aux l; print "\n" |