Skip to content

Commit 1d2a774

Browse files
committed
Fixing make files
1 parent af6e932 commit 1d2a774

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

plugins_src/scripting/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ clean:
7070
rm -f core
7171
(cd docs; $(MAKE) clean)
7272

73-
ESCRIPT=escript
73+
SH?=sh
7474

7575
$(EBIN)/%.beam: $(ESRC)/%.erl
7676
$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
@@ -104,7 +104,7 @@ $(INIT_SCRIPT_SCM_EBIN)/%.scm: $(INIT_SCRIPT_SCM_SRC)/%.scm
104104
$(INIT_SCRIPT_PY_EBIN)/w3d_we.py: $(INIT_SCRIPT_PY_SRC)/w3d_we.1.py \
105105
$(INIT_SCRIPT_SRC)/callable.conf \
106106
$(INIT_SCRIPT_SRC)/py-modnames
107-
./tools/gen-init-we-script.sh \
107+
$(SH) ./tools/gen-init-we-script.sh \
108108
"$(INIT_SCRIPT_PY_SRC)/w3d_we.1.py" \
109109
- \
110110
"$(INIT_SCRIPT_SRC)/callable.conf" \
@@ -116,7 +116,7 @@ $(INIT_SCRIPT_SCM_EBIN)/init.scm: $(INIT_SCRIPT_SCM_SRC)/init.1.scm \
116116
$(INIT_SCRIPT_SRC)/callable.conf \
117117
$(INIT_SCRIPT_SRC)/scm-modnames \
118118
$(INIT_SCRIPT_SCM_SRC)/init.2.scm
119-
./tools/gen-init-we-script.sh \
119+
$(SH) ./tools/gen-init-we-script.sh \
120120
"$(INIT_SCRIPT_SCM_SRC)/init.1.scm" \
121121
"$(INIT_SCRIPT_SCM_SRC)/init.2.scm" \
122122
"$(INIT_SCRIPT_SRC)/callable.conf" \

plugins_src/scripting/docs/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
1010
#
1111

12-
AWK=awk
13-
MKDIR=mkdir -p
14-
PACK_MANUAL=../../../tools/pack_manual
12+
AWK?=awk
13+
MKDIR?=mkdir -p
14+
PACK_MANUAL?=../../../tools/pack_manual
15+
ESCRIPT?=escript
1516

1617
FILES= \
1718
en/INDEX \
@@ -100,7 +101,7 @@ generated/en/py-we.txt: generated/en funs
100101
${SCRIPTINITDIR}/scripting-reference-en.manual: $(FILES) \
101102
generated/en/scm-we.txt \
102103
generated/en/py-we.txt
103-
$(PACK_MANUAL) en \
104+
$(ESCRIPT) $(PACK_MANUAL) en \
104105
--out ${SCRIPTINITDIR}/scripting-reference-en.manual
105106

106107

0 commit comments

Comments
 (0)