diff options
| author | Alain Frisch <alain@frisch.fr> | 2007-11-07 10:14:21 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2007-11-07 10:14:21 +0000 |
| commit | 4ad23db78366d570e587111e927fdbd3c2cd89e8 (patch) | |
| tree | 1f9285aaec026b77fefb0d55815060a976a7fccd | |
| parent | 9299a19d8b74ac7e176c34f6b528f173a380f8ac (diff) | |
Fix ocamlmktop compilation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8485 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | tools/Makefile.nt | 2 | ||||
| -rw-r--r-- | tools/Makefile.shared | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tools/Makefile.nt b/tools/Makefile.nt index 7bfa7922a..b90c0c4f6 100644 --- a/tools/Makefile.nt +++ b/tools/Makefile.nt @@ -19,5 +19,5 @@ include Makefile.shared OCAMLMKTOP=ocamlmktop.cmo OCAMLMKTOP_IMPORTS=misc.cmo config.cmo clflags.cmo ccomp.cmo -ocamlmktop.exe: $(OCAMLMKTOP) +ocamlmktop: $(OCAMLMKTOP) $(CAMLC) $(LINKFLAGS) -o ocamlmktop $(OCAMLMKTOP_IMPORTS) $(OCAMLMKTOP) diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 5f15e7b60..154be6429 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -74,14 +74,8 @@ install:: clean:: rm -f ocamlprof ocamlcp -# 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 + cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE) clean:: rm -f ocamlmktop |