From e609a9ead0505ffcf824177d211d43d685b7c08f Mon Sep 17 00:00:00 2001
From: Jon French
Date: Fri, 21 Jul 2017 20:32:40 +0100
Subject: remove -merge true from ott makefile -- lem at least doesn't build
 with it

---
 language/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/language/Makefile b/language/Makefile
index bbccf6a5..9167d65f 100644
--- a/language/Makefile
+++ b/language/Makefile
@@ -1,6 +1,6 @@
 #OTT=../../../rsem/ott/bin/ott
 # this is the binary that gets rebuilt by make in ott/src:
-OTT=../../../github/ott/src/ott -merge true
+OTT=../../../github/ott/src/ott
 OTTLIB=$(dir $(shell which ott))../hol
 
 .PHONY: all
@@ -33,7 +33,7 @@ doc_in.tex: l2.ott primitive_doc.ott l2_terminals_tt.ott l2_typ.ott l2_rules.ott
 %Script.sml: %.ott
 	$(OTT) -sort false -generate_aux_rules true -o $@ -picky_multiple_parses true $^
 
-l2.lem: l2.ott l2_typ.ott
+l2.lem: l2.ott
 	$(OTT) -sort false -generate_aux_rules true -o $@ -picky_multiple_parses true $^
 
 clean:
@@ -45,4 +45,4 @@ clean:
 
 realclean:
 	$(MAKE) clean
-	rm -rf l2.ml l2_parse.ml l2.lem
\ No newline at end of file
+	rm -rf l2.ml l2_parse.ml l2.lem
-- 
cgit v1.2.3