diff options
| author | Xavier Clerc <xavier.clerc@inria.fr> | 2011-09-07 14:28:24 +0000 |
|---|---|---|
| committer | Xavier Clerc <xavier.clerc@inria.fr> | 2011-09-07 14:28:24 +0000 |
| commit | 6b6e39a3f3ee578305b9e77ec63db93736fef3b4 (patch) | |
| tree | bebddabe2be555b21525194af5046c2085574903 /tools | |
| parent | b61ac6c57573db88861e3ce87a75d53784cde3c1 (diff) | |
| download | ocaml-6b6e39a3f3ee578305b9e77ec63db93736fef3b4.tar.gz | |
PR#5331: ocamlmktop is not always a shell script
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 6 | ||||
| -rw-r--r-- | tools/Makefile.nt | 6 | ||||
| -rw-r--r-- | tools/Makefile.shared | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/tools/Makefile b/tools/Makefile index 754af2a046..da87fa99e5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -19,3 +19,9 @@ include Makefile.shared ocamlmktop: ocamlmktop.tpl ../config/Makefile sed -e 's|%%BINDIR%%|$(BINDIR)|' ocamlmktop.tpl > ocamlmktop chmod +x ocamlmktop + +install:: + cp ocamlmktop $(BINDIR) + +clean:: + rm -f ocamlmktop diff --git a/tools/Makefile.nt b/tools/Makefile.nt index 7331ed06eb..b22e35d280 100644 --- a/tools/Makefile.nt +++ b/tools/Makefile.nt @@ -21,3 +21,9 @@ OCAMLMKTOP_IMPORTS=misc.cmo config.cmo clflags.cmo ccomp.cmo ocamlmktop: $(OCAMLMKTOP) $(CAMLC) $(LINKFLAGS) -o ocamlmktop $(OCAMLMKTOP_IMPORTS) $(OCAMLMKTOP) + +install:: + cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE) + +clean:: + rm -f ocamlmktop$(EXE) diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 9c23b44678..ee3fa28315 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -114,14 +114,6 @@ beforedepend:: ocamlmklib.ml clean:: rm -f ocamlmklib.ml -# To make custom toplevels (see Makefile/Makefile.nt) - -install:: - cp ocamlmktop $(BINDIR)/ # no $(EXE) here, ocamlmktop is a script - -clean:: - rm -f ocamlmktop - # Converter olabl/ocaml 2.99 to ocaml 3 |