Merge branch 'sail2' into rmem_interpreter

1 files changed, 3 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 12684d91..e42b0dba 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ install:
 	mkdir -p $(INSTALL_DIR)/bin
 	cp src/isail.native $(INSTALL_DIR)/bin/sail
 	mkdir -p $(SHARE_DIR)
+	make -C lib/isabelle all
+	make -C lib/hol all-scripts
 	cp -r lib $(SHARE_DIR)
 	mkdir -p $(SHARE_DIR)/src
 	cp src/elf_loader.ml $(SHARE_DIR)/src
@@ -40,9 +42,6 @@ archs:
 	  $(MAKE) -C "$$arch" || exit;\
 	done
 
-isabelle-lib:
-	$(MAKE) -C isabelle-lib
-
 apply_header:
 	$(MAKE) clean
 	headache -c etc/headache_config -h etc/mips_header `ls mips/*.sail`
@@ -73,4 +72,4 @@ clean:
 	for subdir in src arm ; do\
 	  $(MAKE) -C "$$subdir" clean;\
 	done
-	-rm sail
+	rm -f sail