aboutsummaryrefslogtreecommitdiff
path: root/tools/coq_makefile.ml
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2016-11-30 22:47:38 +0100
committerPierre-Marie Pédrot2016-11-30 22:47:38 +0100
commitcf8ecf83b5cc52f7ea73dc1d3af59bf03deff688 (patch)
treebd5a6ad80bb09684899fbcc66963d39ae9a9b52a /tools/coq_makefile.ml
parent88b2eb9279bf5f83f27057094de5b696ee9916e3 (diff)
parent3e6fa1cbdc0ec145728089000595b6ea29f37a4c (diff)
Merge branch 'v8.6'
Diffstat (limited to 'tools/coq_makefile.ml')
-rw-r--r--tools/coq_makefile.ml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index ac69a69a4a..eab909f5b1 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -887,7 +887,7 @@ let merlin targets (ml_inc,_,_) =
print ".merlin:\n";
print "\t@echo 'FLG -rectypes' > .merlin\n" ;
List.iter (fun c ->
- printf "\t@echo \"B $(COQLIB) %s\" >> .merlin\n" c)
+ printf "\t@echo \"B $(COQLIB)%s\" >> .merlin\n" c)
lib_dirs ;
List.iter (fun (_,c) ->
printf "\t@echo \"B %s\" >> .merlin\n" c;