Commit 2939a47e authored by POTTIER Francois's avatar POTTIER Francois

Fix the Makefile in an attempt to allow installation under opam/Cygwin.

parent 8656ba66
2015/10/26:
Fix the Makefile in an attempt to allow installation under opam/Cygwin.
2015/10/23: 2015/10/23:
New declaration "%on_error_reduce foo", where foo is a nonterminal symbol. New declaration "%on_error_reduce foo", where foo is a nonterminal symbol.
This modifies the automaton as follows. In every state where a production of This modifies the automaton as follows. In every state where a production of
......
...@@ -31,30 +31,40 @@ ifndef USE_OCAMLFIND ...@@ -31,30 +31,40 @@ ifndef USE_OCAMLFIND
USE_OCAMLFIND = ocamlfind ocamlc -v >/dev/null 2>&1 USE_OCAMLFIND = ocamlfind ocamlc -v >/dev/null 2>&1
endif endif
# ----------------------------------------------------------------------------
# Installation paths.
bindir := ${PREFIX}/bin
docdir := ${PREFIX}/share/doc/menhir
libdir := ${PREFIX}/share/menhir
mandir := ${PREFIX}/share/man/man1
MANS := menhir.1
DOCS := manual.pdf demos
MLYLIB := src/standard.mly
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# A few settings differ on Windows versus Unix. # A few settings differ on Windows versus Unix.
# If the compiler is MSVC, then the name of the executable file ends in .exe,
# and object file names end in .obj instead of .o.
ifeq "$(shell ocamlc -config | grep ccomp_type)" "ccomp_type: msvc" ifeq "$(shell ocamlc -config | grep ccomp_type)" "ccomp_type: msvc"
MENHIREXE := menhir.exe MENHIREXE := menhir.exe
OBJ := obj OBJ := obj
# LIBSUFFIX := lib # LIBSUFFIX := lib
else else
MENHIREXE := menhir MENHIREXE := menhir
OBJ := o OBJ := o
# LIBSUFFIX := a # LIBSUFFIX := a
endif endif
# ---------------------------------------------------------------------------- # If Cygwin is present, then the path ${libdir} that is recorded in
# Installation paths. # src/installation.ml (see below) must be translated using cygpath.
bindir := ${PREFIX}/bin libdir := $(shell if which cygpath >/dev/null ; \
docdir := ${PREFIX}/share/doc/menhir then echo "cygpath -m ${libdir}" ; \
libdir := ${PREFIX}/share/menhir else echo ${libdir} ; fi)
mandir := ${PREFIX}/share/man/man1
MANS := menhir.1
DOCS := manual.pdf demos
MLYLIB := src/standard.mly
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
......
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