diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2015-07-17 14:31:05 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2015-07-17 14:31:05 +0000 |
| commit | 860c670848440f791d1b9c68a1ace8fb629da234 (patch) | |
| tree | 6b856e6a04cf876221c6740e8df75a8778a3b8b7 /debugger | |
| parent | 7fdba8f53360d9355dc96953a0d8225e111ab722 (diff) | |
| download | ocaml-860c670848440f791d1b9c68a1ace8fb629da234.tar.gz | |
merge branch 4.02 from 4.02.1 (rev 15540) to a few fixes after 4.02.2 (rev 16205)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16214 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/Makefile.shared | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debugger/Makefile.shared b/debugger/Makefile.shared index 645c3e1dd4..f3859c63d2 100644 --- a/debugger/Makefile.shared +++ b/debugger/Makefile.shared @@ -11,15 +11,15 @@ ######################################################################### include ../config/Makefile +CAMLRUN ?= ../boot/ocamlrun +CAMLYACC ?= ../boot/ocamlyacc -ROOTDIR=.. -CAMLC=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib +CAMLC=$(CAMLRUN) ../ocamlc -nostdlib -I ../stdlib COMPFLAGS=-warn-error A -safe-string $(INCLUDES) LINKFLAGS=-linkall -I $(UNIXDIR) -CAMLYACC=../boot/ocamlyacc YACCFLAGS= -CAMLLEX=../boot/ocamlrun ../boot/ocamllex -CAMLDEP=../boot/ocamlrun ../tools/ocamldep +CAMLLEX=$(CAMLRUN) ../boot/ocamllex +CAMLDEP=$(CAMLRUN) ../tools/ocamldep DEPFLAGS=$(INCLUDES) INSTALL_BINDIR=$(DESTDIR)$(BINDIR) |