diff options
| author | Alain Frisch <alain@frisch.fr> | 2014-04-14 11:52:29 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2014-04-14 11:52:29 +0000 |
| commit | 6346154d4bc690c7909d5cff4bf7fc1bc57bbcc6 (patch) | |
| tree | 7faa3541ad30d103e071e850f5bfe2f66bfe2e0a /debugger/Makefile.shared | |
| parent | 907c477c02450deb9b452b47599dc1d16806395c (diff) | |
| parent | 5f5bd08abc667d67762e80f1febded27a99842b9 (diff) | |
| download | ocaml-6346154d4bc690c7909d5cff4bf7fc1bc57bbcc6.tar.gz | |
Synchronize with trunk.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/constructors_with_record3@14587 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'debugger/Makefile.shared')
| -rw-r--r-- | debugger/Makefile.shared | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/debugger/Makefile.shared b/debugger/Makefile.shared index d85419eb0c..249e8b4c40 100644 --- a/debugger/Makefile.shared +++ b/debugger/Makefile.shared @@ -12,7 +12,8 @@ include ../config/Makefile -CAMLC=../ocamlcomp.sh +ROOTDIR=.. +CAMLC=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib COMPFLAGS=-warn-error A $(INCLUDES) LINKFLAGS=-linkall -I $(UNIXDIR) CAMLYACC=../boot/ocamlyacc @@ -21,6 +22,8 @@ CAMLLEX=../boot/ocamlrun ../boot/ocamllex CAMLDEP=../boot/ocamlrun ../tools/ocamldep DEPFLAGS=$(INCLUDES) +INSTALL_BINDIR=$(DESTDIR)$(BINDIR) + INCLUDES=\ -I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../toplevel \ -I $(UNIXDIR) @@ -83,7 +86,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS) $(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS) install: - cp ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE) + cp ocamldebug$(EXE) $(INSTALL_BINDIR)/ocamldebug$(EXE) clean:: rm -f ocamldebug$(EXE) |