From da3edaa7eab2bed17cdfb2c455f2e6b5b0318c4d Mon Sep 17 00:00:00 2001
From: letouzey
Date: Sat, 15 Sep 2007 10:35:59 +0000
Subject: * Adding compability with ocaml 3.10 + camlp5 (rework of   the patch
 by S. Mimram) * for detecting architecture, also look for /bin/uname *
 restore the compatibility of kernel/byterun/coq_interp.c with   ocaml 3.07
 (caml_modify vs. modify). There is still an issue   with this 3.07 and
 64-bits architecture (see coqdev and a future   bug report).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10122 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 tools/coq_makefile.ml4 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/coq_makefile.ml4 b/tools/coq_makefile.ml4
index cc3b60923f..02bfbbb37c 100644
--- a/tools/coq_makefile.ml4
+++ b/tools/coq_makefile.ml4
@@ -175,7 +175,8 @@ let variables l =
     | _ :: r -> var_aux r
   in
   section "Variables definitions.";
-  print "CAMLP4LIB=`camlp4 -where`\n";
+  print "CAMLP4LIB=`camlp5 -where 2> /dev/null || camlp4 -where`\n";
+  print "CAMLP4=`basename $CAMLP4LIB`\n"; 
 (*  print "MAKE=make \"COQBIN=$(COQBIN)\" \"OPT=$(OPT)\"\n"; *)
   print "COQSRC=-I $(COQTOP)/kernel -I $(COQTOP)/lib \\
   -I $(COQTOP)/library -I $(COQTOP)/parsing \\
@@ -204,8 +205,8 @@ let variables l =
   print "CAMLOPTLINK=ocamlopt\n";
   print "COQDEP=$(COQBIN)coqdep -c\n";
   print "GRAMMARS=grammar.cma\n";
-  print "CAMLP4EXTEND=pa_extend.cmo pa_ifdef.cmo q_MLast.cmo\n";
-  print "PP=-pp \"camlp4o -I . -I $(COQTOP)/parsing $(CAMLP4EXTEND) $(GRAMMARS) -impl\"\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";
   var_aux l;
   print "\n"
 
-- 
cgit v1.2.3