Commit 16466cac by POTTIER Francois

Distinguished $(installation_libdir) from $(libdir).

In the previous version, the redefinition of $(libdir) was ineffective when we were called from opam, which overrides $(libdir) from outside.
parent 8e650ba2
2015/11/02:
Fix-fix-and-re-fix the Makefile in an attempt to allow installation under
opam/Windows. Thanks to Daniel Weil for his patient explanations.
2015/10/29:
MenhirLib is now installed in both binary and source forms.
"menhir --suggest-menhirLib" reports where MenhirLib is installed.
......@@ -5,10 +9,6 @@ This can be used to retrieve a snapshot of MenhirLib in source form
and include it in your project (if you wish to use --table mode, yet
do not wish to have a dependency on MenhirLib).
2015/10/27:
Fix the Makefile in an attempt to allow installation under opam/Windows.
Thanks to Daniel Weil for his patient explanations.
2015/10/26:
Allow --list-errors to work on 32-bit machines (with low hard limits).
This should fix a problem whereby the 2015/10/23 release could not
......
......@@ -33,6 +33,8 @@ endif
# ----------------------------------------------------------------------------
# Installation paths.
# These may be overridden from outside; e.g., our opam package description
# provides its own values of docdir, libdir, and mandir.
bindir := $(PREFIX)/bin
docdir := $(PREFIX)/share/doc/menhir
......@@ -59,8 +61,8 @@ else
# LIBSUFFIX := a
endif
# The path $(libdir), which is recorded in src/installation.ml (see below),
# must sometimes be translated using cygpath.
# The path $(installation_libdir), which is recorded in src/installation.ml (see
# below), must sometimes be translated using cygpath.
# This one is tricky. To summarize, if I understood correctly, we can assume
# that Cygwin always exists when Menhir is compiled and installed (because
......@@ -75,7 +77,9 @@ endif
# "os_type" is "Cygwin" or "Unix".
ifneq (,$(findstring "os_type: Win", "$(shell ocamlc -config | grep os_type)"))
libdir := $(shell cygpath -m $(libdir))
installation_libdir := $(shell cygpath -m $(libdir))
else
installation_libdir := $(libdir)
endif
# ----------------------------------------------------------------------------
......@@ -91,7 +95,7 @@ BUILDDIR := src/_stage2
all:
@ rm -f src/installation.ml
@ echo "let libdir = \"$(libdir)\"" > src/installation.ml
@ echo "let libdir = \"$(installation_libdir)\"" > src/installation.ml
@ if $(USE_OCAMLFIND) ; then \
echo "let ocamlfind = true" >> src/installation.ml ; \
else \
......
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