Commit a9ff58bd authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Fixed a couple bugs in Makefile and src/Makefile which would cause compilation

and installation to fail with "TARGET=byte". (Reported by Daniel Dickman.)
parent ce38fc99
2015/01/16:
Fixed a couple bugs in Makefile and src/Makefile which would cause compilation
and installation to fail with "TARGET=byte". (Reported by Daniel Dickman.)
2015/01/01: 2015/01/01:
Incompatible change of the incremental API. Incompatible change of the incremental API.
The entry point main_incremental is now named Incremental.main. The entry point main_incremental is now named Incremental.main.
......
...@@ -95,7 +95,7 @@ install: ...@@ -95,7 +95,7 @@ install:
mkdir -p $(libdir) mkdir -p $(libdir)
mkdir -p $(docdir) mkdir -p $(docdir)
mkdir -p $(mandir) mkdir -p $(mandir)
install $(BUILDDIR)/menhir.native $(bindir)/$(MENHIREXE) install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE)
install -m 644 $(MLYLIB) $(libdir) install -m 644 $(MLYLIB) $(libdir)
cp -r $(DOCS) $(docdir) cp -r $(DOCS) $(docdir)
cp -r $(MANS) $(mandir) cp -r $(MANS) $(mandir)
......
...@@ -60,11 +60,15 @@ stage1: ...@@ -60,11 +60,15 @@ stage1:
# Stage 2. # Stage 2.
# Build Menhir using Menhir (from stage 1). # Build Menhir using Menhir (from stage 1).
FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib . --strict --fixed-exception # Do not use . to refer to the current directory, because ocamlbuild
# descends into another directory when executing commands.
SRC := $(shell pwd)
FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib $(SRC) --strict --fixed-exception
stage2: stage2:
@$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \ @$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \
-use-menhir -menhir "$(shell pwd)/_stage1/menhir.$(TARGET) $(FLAGS)" \ -use-menhir -menhir "$(SRC)/_stage1/menhir.$(TARGET) $(FLAGS)" \
menhir.$(TARGET) menhir.$(TARGET)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
...@@ -73,7 +77,7 @@ stage2: ...@@ -73,7 +77,7 @@ stage2:
# is identical to the stage 2 parser. # is identical to the stage 2 parser.
stage3: stage3:
@$(OCAMLBUILD) -build-dir _stage3 -tag fancy_parser \ @$(OCAMLBUILD) -build-dir _stage3 -tag fancy_parser \
-use-menhir -menhir "$(shell pwd)/_stage2/menhir.$(TARGET) $(FLAGS)" \ -use-menhir -menhir "$(SRC)/_stage2/menhir.$(TARGET) $(FLAGS)" \
parser.ml parser.mli parser.ml parser.mli
@for i in parser.ml parser.mli ; do \ @for i in parser.ml parser.mli ; do \
if ! diff _stage2/$$i _stage3/$$i 2>&1 >/dev/null ; then \ if ! diff _stage2/$$i _stage3/$$i 2>&1 >/dev/null ; then \
......
Supports Markdown
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