summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/Makefile9
-rw-r--r--[-rwxr-xr-x]tools/ocamlmktop.tpl (renamed from tools/ocamlmktop)2
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 14204d39e..079a869ef 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,7 @@ INCLUDES=-I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../asmcomp \
COMPFLAGS=$(INCLUDES)
LINKFLAGS=$(INCLUDES)
-all: ocamldep ocamlprof ocamlcp
+all: ocamldep ocamlprof ocamlcp ocamlmktop
# The dependency generator
@@ -54,9 +54,16 @@ clean::
# To make custom toplevels
+ocamlmktop: ocamlmktop.tpl ../config/Makefile
+ sed -e 's|%%BINDIR%%|$(BINDIR)|' ocamlmktop.tpl > ocamlmktop
+ chmod +x ocamlmktop
+
install::
cp ocamlmktop $(BINDIR)/ocamlmktop
+clean::
+ rm -f ocamlmktop
+
# The preprocessor for asm generators
CVT_EMIT=cvt_emit.cmo
diff --git a/tools/ocamlmktop b/tools/ocamlmktop.tpl
index 7bab3c7cf..7cf6990b6 100755..100644
--- a/tools/ocamlmktop
+++ b/tools/ocamlmktop.tpl
@@ -4,7 +4,7 @@
if : == x
then # Bourne Shell
- exec ocamlc -linkall toplevellib.cma "$@" topmain.cmo
+ exec %%BINDIR%%/ocamlc -linkall toplevellib.cma "$@" topmain.cmo
else # MPW Shell
ocamlc-custom -linkall toplevellib.cma {"parameters"} topmain.cmo
exit {status}