Commit 17f51fc4 authored by MARCHE Claude's avatar MARCHE Claude

Fixed caml install dir in Makefile.config

parent 945973a9
......@@ -282,6 +282,7 @@ endif
cp -f share/images/boomy/*.png $(DATADIR)/why3/images/boomy
cp -f share/images/fatcow/*.png $(DATADIR)/why3/images/fatcow
cp -f share/why3session.dtd $(DATADIR)/why3
cp -f share/Makefile.config $(DATADIR)/why3
cp -rf share/javascript $(DATADIR)/why3/javascript
cp -f share/vim/why3.vim $(DATADIR)/why3/vim/why3.vim
cp -f share/lang/why3.lang $(DATADIR)/why3/lang/why3.lang
......
......@@ -51,7 +51,7 @@ $(GENML): ../vstte12_combinators.mlw
clean::
rm -f $(GENML) *.cm[xio] *.o *.annot $(MAIN).opt $(MAIN).byte
rm -f vstte12_combinators__*.ml*
rm -f vstte12_combinators__*.ml*
# javascript
......@@ -61,12 +61,13 @@ JSMAIN=jsmain
JSOCAMLC=ocamlfind ocamlc -package js_of_ocaml -package js_of_ocaml.syntax \
-syntax camlp4o
$(JSMAIN).js: $(JSMAIN).byte
$(JSMAIN).js: $(JSMAIN).byte
js_of_ocaml -pretty -noinline $(JSMAIN).byte
$(JSMAIN).byte: $(ML) jsmain.ml
$(JSOCAMLC) $(INCLUDE) -o $@ -linkpkg $^
# $(JSOCAMLC) $(INCLUDE) $(BIGINTLIB).cma why3extract.cma -o $@ -linkpkg $^
%.cmo: %.ml
......@@ -78,4 +79,3 @@ $(JSMAIN).byte: $(ML) jsmain.ml
clean::
rm -f *.cm[io] $(NAME).byte $(NAME).js
......@@ -40,7 +40,7 @@ LIBDIR = $libdir
DATADIR = $datadir
OCAMLBEST = @OCAMLBEST@
BIGINTLIB = @BIGINTLIB@
INCLUDE = @BIGINTINCLUDE@ -I $libdir/why3
INCLUDE = @BIGINTINCLUDE@ -I @OCAMLINSTALLLIB@/why3
" > $makefileconfig
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment