From 3ac6551b239281f2bd985488ad3eb36b9b107115 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Sat, 22 Dec 2012 05:10:11 +0000
Subject: Avoiding collision between Camlp4 Loc.Exc_located and Coq's
 Loc.Exc_located.

Also fixing coqmktop for use with Camlp4. Don't know if this is the
fix intended by coqmktop experts or not, though.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16113 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 scripts/coqmktop.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml
index 76548aa3d6..9220605e85 100644
--- a/scripts/coqmktop.ml
+++ b/scripts/coqmktop.ml
@@ -46,7 +46,7 @@ let camlp4topobjs =
       "Camlp4Parsers/Camlp4OCamlRevisedParser.cmo";
       "Camlp4Parsers/Camlp4OCamlParser.cmo";
       "Camlp4Parsers/Camlp4GrammarParser.cmo";
-      "q_util.cmo"; "q_coqast.cmo" ]
+      "grammar/q_util.cmo"; "grammar/q_coqast.cmo" ]
 let topobjs = camlp4topobjs
 
 let gramobjs = []
-- 
cgit v1.2.3