Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
POTTIER Francois
menhir
Commits
7c8c5a62
Commit
7c8c5a62
authored
Oct 27, 2015
by
POTTIER Francois
Browse files
Replace ${} with $() for uniformity.
parent
0344bb69
Changes
1
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
7c8c5a62
...
...
@@ -34,10 +34,10 @@ endif
# ----------------------------------------------------------------------------
# Installation paths.
bindir
:=
$
{
PREFIX
}
/bin
docdir
:=
$
{
PREFIX
}
/share/doc/menhir
libdir
:=
$
{
PREFIX
}
/share/menhir
mandir
:=
$
{
PREFIX
}
/share/man/man1
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
...
...
@@ -59,7 +59,7 @@ else
# LIBSUFFIX := a
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.
# This one is tricky. To summarize, if I understood correctly, we can assume
...
...
@@ -75,7 +75,7 @@ endif
# "os_type" is "Cygwin" or "Unix".
ifneq
(,$(findstring "os_type: Win", "$(shell ocamlc -config | grep os_type)"))
libdir
:=
$(
shell
cygpath
-m
$
{
libdir
}
)
libdir
:=
$(
shell
cygpath
-m
$
(
libdir
)
)
endif
# -------------------------------------------------------------------------
...
...
@@ -98,7 +98,7 @@ endif
all
:
rm
-f
src/installation.ml
echo
"let libdir =
\"
$
{
libdir
}
\"
"
>
src/installation.ml
echo
"let libdir =
\"
$
(
libdir
)
\"
"
>
src/installation.ml
if
$(USE_OCAMLFIND)
;
then
\
echo
"let ocamlfind = true"
>>
src/installation.ml
;
\
else
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment