oublis varies

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4975 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Makefile.nt

@@ -225,6 +225,7 @@ installbyt:
 	cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi $(LIBDIR)
 	cd tools ; $(MAKEREC) install
 	cd ocamldoc ; $(MAKEREC) install
+	mkdir -p $(STUBLIBDIR)
 	for i in $(OTHERLIBRARIES); do $(MAKEREC) -C otherlibs/$$i install; done
 ifeq ($(TOOLCHAIN),msvc)
 	cd win32caml ; $(MAKE) install

config/Makefile.msvc

@@ -113,7 +113,7 @@ BIGNUM_ARCH=C
 # Set TK_ROOT to the directory where you installed TCL/TK 8.3
 TK_ROOT=c:/tcl
 TK_DEFS=-I$(TK_ROOT)/include
-TK_LINK=tk83.lib tcl83.lib
+TK_LINK=/link /libpath:$(TK_ROOT)/lib tk83.lib tcl83.lib
 
 ############# Aliases for common commands
 

otherlibs/labltk/support/Makefile.common.nt

@@ -17,7 +17,7 @@ TKLINKOPT=$(STATIC)
 
 CAMLRUN=$(EXEDIR)/boot/ocamlrun
 CAMLC=$(CAMLRUN) $(TOPDIR)/ocamlc -I $(TOPDIR)/stdlib
-CAMLCOMP=$(CAMLC) -labels -c
+CAMLCOMP=$(CAMLC) -c
 CAMLYACC=$(EXEDIR)/boot/ocamlyacc -v
 CAMLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex
 CAMLLIBR=$(CAMLC) -a
@@ -25,5 +25,5 @@ CAMLDEP=$(CAMLRUN) $(TOPDIR)/tools/ocamldep
 COMPFLAGS=
 LINKFLAGS=
 
-CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -labels
+CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib
 CAMLOPTLIBR=$(CAMLOPT) -a

otherlibs/labltk/support/Makefile.nt

@@ -35,7 +35,7 @@ PUB=fileevent.cmi fileevent.mli \
 install:
 	mkdir -p $(INSTALLDIR)
 	cp $(PUB) $(INSTALLDIR)
-	cp dll$(LIBNAME).dll $(STUBLIBDIR)/stublibs/dll$(LIBNAME).dll 
+	cp dll$(LIBNAME).dll $(STUBLIBDIR)/dll$(LIBNAME).dll 
 	cp dll$(LIBNAME).$(A) lib$(LIBNAME).$(A) $(INSTALLDIR)
 
 clean :