Commit 7c8c5a62 authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Replace ${} with $() for uniformity.

parent 0344bb69
...@@ -34,10 +34,10 @@ endif ...@@ -34,10 +34,10 @@ endif
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Installation paths. # Installation paths.
bindir := ${PREFIX}/bin bindir := $(PREFIX)/bin
docdir := ${PREFIX}/share/doc/menhir docdir := $(PREFIX)/share/doc/menhir
libdir := ${PREFIX}/share/menhir libdir := $(PREFIX)/share/menhir
mandir := ${PREFIX}/share/man/man1 mandir := $(PREFIX)/share/man/man1
MANS := menhir.1 MANS := menhir.1
DOCS := manual.pdf demos DOCS := manual.pdf demos
MLYLIB := src/standard.mly MLYLIB := src/standard.mly
...@@ -59,7 +59,7 @@ else ...@@ -59,7 +59,7 @@ else
# LIBSUFFIX := a # LIBSUFFIX := a
endif endif
# The path ${libdir}, which is recorded in src/installation.ml (see below), # The path $(libdir), which is recorded in src/installation.ml (see below),
# must sometimes be translated using cygpath. # must sometimes be translated using cygpath.
# This one is tricky. To summarize, if I understood correctly, we can assume # This one is tricky. To summarize, if I understood correctly, we can assume
...@@ -75,7 +75,7 @@ endif ...@@ -75,7 +75,7 @@ endif
# "os_type" is "Cygwin" or "Unix". # "os_type" is "Cygwin" or "Unix".
ifneq (,$(findstring "os_type: Win", "$(shell ocamlc -config | grep os_type)")) ifneq (,$(findstring "os_type: Win", "$(shell ocamlc -config | grep os_type)"))
libdir := $(shell cygpath -m ${libdir}) libdir := $(shell cygpath -m $(libdir))
endif endif
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
...@@ -98,7 +98,7 @@ endif ...@@ -98,7 +98,7 @@ endif
all: all:
rm -f src/installation.ml rm -f src/installation.ml
echo "let libdir = \"${libdir}\"" > src/installation.ml echo "let libdir = \"$(libdir)\"" > src/installation.ml
if $(USE_OCAMLFIND) ; then \ if $(USE_OCAMLFIND) ; then \
echo "let ocamlfind = true" >> src/installation.ml ; \ echo "let ocamlfind = true" >> src/installation.ml ; \
else \ 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