Paths

.gitignore

@@ -3,4 +3,5 @@
 *.cmx
 *.o
 version.ml
+stdpath.ml
 

regression/Makefile

@@ -10,7 +10,7 @@ $(TESTS): %: %.lama
 	@echo $@
 	cat $@.input | $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log
 	cat $@.input | $(LAMAC) -s $< > $@.log && diff $@.log orig/$@.log
-	$(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log
+	LAMA=../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log
 
 clean:
 	$(RM) test*.log *.s *~ $(TESTS) *.i

src/Makefile

@@ -2,16 +2,17 @@ TOPFILE = lamac
 OCAMLC = ocamlfind c
 OCAMLOPT = ocamlfind opt
 OCAMLDEP = ocamlfind dep
-SOURCES = Language.ml SM.ml X86.ml version.ml Driver.ml
+SOURCES = version.ml stdpath.ml Language.ml SM.ml X86.ml Driver.ml
 CAMLP5 = -syntax camlp5o -package ostap.syntax,GT.syntax.all
 PXFLAGS = $(CAMLP5)
 BFLAGS = -rectypes -g
 OFLAGS = $(BFLAGS)
 
-all: version .depend $(TOPFILE)
+all: metagen .depend $(TOPFILE)
 
-version:
+metagen:
 	echo "let version = \"Version `git rev-parse --abbrev-ref HEAD`, `git rev-parse --short HEAD`, `git rev-parse --verify HEAD |git show --no-patch --no-notes --pretty='%cd'`\"" > version.ml
+	echo "let path = \"`opam var share`/Lama\"" > stdpath.ml
 
 .depend: $(SOURCES)
 	$(OCAMLDEP) $(PXFLAGS) *.ml > .depend

src/X86.ml

@@ -692,7 +692,7 @@ let genasm cmd prog =
 let get_std_path () =
   match Sys.getenv_opt "LAMA" with
   | Some s -> s
-  | None   -> "../runtime"
+  | None   -> Stdpath.path
                                       
 (* Builds a program: generates the assembler file and compiles it with the gcc toolchain *)
 let build cmd prog =

stdlib/Makefile

@@ -17,7 +17,7 @@ Ostap.o: List.o Collection.o Ref.o Fun.o Matcher.o
 Expr.o: Ostap.o
 
 %.o: %.lama
-	$(LAMAC) -I . -c $<
+	LAMA=../runtime $(LAMAC) -I . -c $<
 
 clean:
 	rm -Rf *.s *.o *.i *~