From 8fa50e9e2fc4752e9c7e14b59ad0c749f56914b4 Mon Sep 17 00:00:00 2001
From: Brian Campbell
Date: Fri, 1 Feb 2019 14:28:30 +0000
Subject: Tweak HOL LEM_DIR to match riscv makefile

---
 lib/hol/Holmakefile | 4 ++--
 lib/hol/Makefile    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/hol/Holmakefile b/lib/hol/Holmakefile
index 08155507..0da5813f 100644
--- a/lib/hol/Holmakefile
+++ b/lib/hol/Holmakefile
@@ -12,7 +12,7 @@ SCRIPTS = $(LEM_SCRIPTS) \
 
 THYS = $(patsubst %Script.sml,%Theory.uo,$(SCRIPTS))
 
-INCLUDES = $(LEM_DIR)
+INCLUDES = $(LEM_DIR)/hol-lib
 
 all: $(THYS)
 .PHONY: all
@@ -23,7 +23,7 @@ ifdef POLY
 HOLHEAP = sail-heap
 EXTRA_CLEANS = $(LEM_CLEANS) $(HOLHEAP) $(HOLHEAP).o
 
-BASE_HEAP = $(LEM_DIR)/lemheap
+BASE_HEAP = $(LEM_DIR)/hol-lib/lemheap
 
 $(HOLHEAP): $(BASE_HEAP)
 	$(protect $(HOLDIR)/bin/buildheap) -o $(HOLHEAP) -b $(BASE_HEAP)
diff --git a/lib/hol/Makefile b/lib/hol/Makefile
index 204328d4..c863a05b 100644
--- a/lib/hol/Makefile
+++ b/lib/hol/Makefile
@@ -1,4 +1,4 @@
-LEM_DIR?=$(shell opam config var lem:share)/hol-lib
+LEM_DIR?=$(shell opam config var lem:share)
 
 LEMSRC =  \
   ../../src/lem_interp/sail2_instr_kinds.lem \
-- 
cgit v1.2.3