- OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
-diff -Nur b.ocaml-3.08.4/byterun/Makefile.nt n.ocaml-3.08.4/byterun/Makefile.nt
---- b.ocaml-3.08.4/byterun/Makefile.nt 2004-08-20 17:11:36.000000000 +0200
-+++ n.ocaml-3.08.4/byterun/Makefile.nt 2005-11-04 21:26:14.410376336 +0100
-@@ -16,7 +16,7 @@
- include ../config/Makefile
-
- CC=$(BYTECC)
--CFLAGS=-DIN_OCAMLRUN -DOCAML_STDLIB_DIR='"$(LIBDIR)"'
-+override CFLAGS += -DIN_OCAMLRUN -DOCAML_STDLIB_DIR='"$(LIBDIR)"'
-
- COMMONOBJS=interp.o misc.o stacks.o fix_code.o startup.o \
- fail.o signals.o freelist.o major_gc.o minor_gc.o \
-diff -Nur b.ocaml-3.08.4/otherlibs/bigarray/Makefile n.ocaml-3.08.4/otherlibs/bigarray/Makefile
---- b.ocaml-3.08.4/otherlibs/bigarray/Makefile 2002-06-27 13:36:00.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/bigarray/Makefile 2005-11-04 21:26:14.722328912 +0100
-@@ -16,7 +16,7 @@
- include ../../config/Makefile
-
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh -I ../unix
- CAMLOPT=../../ocamlcompopt.sh -I ../unix
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-diff -Nur b.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt n.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt 2003-07-08 16:24:07.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt 2005-11-04 21:26:14.723328760 +0100
-@@ -16,7 +16,7 @@
- include ../../config/Makefile
-
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -I../win32unix -DIN_OCAML_BIGARRAY
-+override CFLAGS += -I../../byterun -I../win32unix -DIN_OCAML_BIGARRAY
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../win32unix
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../win32unix
-
-diff -Nur b.ocaml-3.08.4/otherlibs/dbm/Makefile n.ocaml-3.08.4/otherlibs/dbm/Makefile
---- b.ocaml-3.08.4/otherlibs/dbm/Makefile 2002-06-27 13:36:01.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/dbm/Makefile 2005-11-04 21:26:14.724328608 +0100
-@@ -24,7 +24,7 @@
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
- COMPFLAGS=-warn-error A
-
--CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += $(DBM_INCLUDES) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- COBJS=cldbm.o
-
- all: libmldbm.a dbm.cmi dbm.cma
-diff -Nur b.ocaml-3.08.4/otherlibs/graph/Makefile n.ocaml-3.08.4/otherlibs/graph/Makefile
---- b.ocaml-3.08.4/otherlibs/graph/Makefile 2005-06-22 17:47:33.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/graph/Makefile 2005-11-04 21:26:14.727328152 +0100
-@@ -18,7 +18,7 @@
- include ../../config/Makefile
-
- CC=$(BYTECC)
--CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += -I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh
- CAMLOPT=../../ocamlcompopt.sh
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt 2005-06-27 09:01:40.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt 2005-11-04 21:26:14.730327696 +0100
-@@ -4,7 +4,7 @@
- OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads
- OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing
- INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB)
--CCFLAGS=-I../../../byterun $(TK_DEFS)
-+override CCFLAGS += -I../../../byterun $(TK_DEFS) $(CFLAGS)
-
- ifeq ($(CCOMPTYPE),cc)
- WINDOWS_APP=-cclib "-Wl,--subsystem,windows"
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/support/Makefile n.ocaml-3.08.4/otherlibs/labltk/support/Makefile
---- b.ocaml-3.08.4/otherlibs/labltk/support/Makefile 2002-06-27 13:36:01.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/support/Makefile 2005-11-04 21:26:14.772321312 +0100
-@@ -11,7 +11,7 @@
- COBJS=cltkCaml.o cltkUtf.o cltkEval.o cltkEvent.o cltkFile.o cltkMain.o \
- cltkMisc.o cltkTimer.o cltkVar.o cltkWait.o cltkImg.o
-
--CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
-+override CCFLAGS += -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
-
- COMPFLAGS=-I $(OTHERS)/unix
-
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt 2003-07-10 11:18:02.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt 2005-11-04 21:26:14.774321008 +0100