Installer les stub DLLs dans LIBDIR/stublibs

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

19 files changed, 21 insertions, 23 deletions

diff --git a/otherlibs/bigarray/Makefile b/otherlibs/bigarray/Makefile
index ea7173f58f..715428fca6 100644
--- a/otherlibs/bigarray/Makefile
+++ b/otherlibs/bigarray/Makefile
@@ -41,7 +41,7 @@ bigarray.cmxa: $(CAML_OBJS:.cmo=.cmx)
           $(CAML_OBJS:.cmo=.cmx)
 
 install:
-	if test -f dllbigarray.so; then cp dllbigarray.so $(LIBDIR)/dllbigarray.so; fi
+	if test -f dllbigarray.so; then cp dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
 	cp bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
 	cd $(LIBDIR); $(RANLIB) libbigarray.a
 	cp bigarray.h $(LIBDIR)/caml/bigarray.h
diff --git a/otherlibs/bigarray/Makefile.nt b/otherlibs/bigarray/Makefile.nt
index ea647ab1a1..f4abfd1152 100644
--- a/otherlibs/bigarray/Makefile.nt
+++ b/otherlibs/bigarray/Makefile.nt
@@ -45,8 +45,8 @@ bigarray.cmxa: $(CAML_OBJS:.cmo=.cmx)
            $(CAML_OBJS:.cmo=.cmx) -cclib -lbigarray
 
 install:
-	cp dllbigarray.dll libbigarray.$(A) $(LIBDIR)
-	cp bigarray.cmi bigarray.mli bigarray.cma $(LIBDIR)
+	cp dllbigarray.dll $(STUBLIBDIR)
+	cp libbigarray.$(A) bigarray.cmi bigarray.mli bigarray.cma $(LIBDIR)
 	cp bigarray.h $(LIBDIR)/caml/bigarray.h
 
 installopt:
diff --git a/otherlibs/dbm/Makefile b/otherlibs/dbm/Makefile
index e09fc26f9e..394586416c 100644
--- a/otherlibs/dbm/Makefile
+++ b/otherlibs/dbm/Makefile
@@ -47,7 +47,7 @@ clean: partialclean
 	rm -f *.a *.o *.so
 
 install:
-	if test -f dllmldbm.so; then cp dllmldbm.so $(LIBDIR)/dllmldbm.so; fi
+	if test -f dllmldbm.so; then cp dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
 	cp libmldbm.a $(LIBDIR)/libmldbm.a
 	cd $(LIBDIR); $(RANLIB) libmldbm.a
 	cp dbm.cma dbm.cmi dbm.mli $(LIBDIR)
diff --git a/otherlibs/graph/Makefile b/otherlibs/graph/Makefile
index 2e3911ebaf..0b1cd3a374 100644
--- a/otherlibs/graph/Makefile
+++ b/otherlibs/graph/Makefile
@@ -50,7 +50,7 @@ clean: partialclean
 	rm -f *.a *.so *.o
 
 install:
-	if test -f dllgraphics.so; then cp dllgraphics.so $(LIBDIR)/dllgraphics.so; fi
+	if test -f dllgraphics.so; then cp dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
 	cp libgraphics.a $(LIBDIR)/libgraphics.a
 	cd $(LIBDIR); $(RANLIB) libgraphics.a
 	cp graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile
index f883c90ceb..bc1044039c 100644
--- a/otherlibs/labltk/lib/Makefile
+++ b/otherlibs/labltk/lib/Makefile
@@ -60,8 +60,6 @@ $(LIBNAME): Makefile $(TOPDIR)/config/Makefile
 
 install:
 	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
-	if test `grep -s -c '^$(INSTALLDIR)$$' $(LIBDIR)/ld.conf || :` = 0; \
-        then echo $(INSTALLDIR) >> $(LIBDIR)/ld.conf; fi
 	cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR)
 	chmod 644 $(INSTALLDIR)/$(LIBNAME).cma
 	chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
diff --git a/otherlibs/labltk/support/Makefile b/otherlibs/labltk/support/Makefile
index 4e7e6c413a..36d5190308 100644
--- a/otherlibs/labltk/support/Makefile
+++ b/otherlibs/labltk/support/Makefile
@@ -31,8 +31,7 @@ install: lib$(LIBNAME).a $(PUB)
 	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).a
 	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).a
 	if test -f dll$(LIBNAME).so; then \
-	   cp dll$(LIBNAME).so $(INSTALLDIR)/dll$(LIBNAME).so; \
-	   chmod 644 $(INSTALLDIR)/dll$(LIBNAME).so; fi
+	   cp dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
 
 clean : 
 	rm -f *.cm* *.o *.a *.so
diff --git a/otherlibs/labltk/support/Makefile.nt b/otherlibs/labltk/support/Makefile.nt
index d7cc022487..c0efd2a629 100644
--- a/otherlibs/labltk/support/Makefile.nt
+++ b/otherlibs/labltk/support/Makefile.nt
@@ -35,8 +35,8 @@ PUB=fileevent.cmi fileevent.mli \
 install:
 	mkdir -p $(INSTALLDIR)
 	cp $(PUB) $(INSTALLDIR)
-	cp dll$(LIBNAME).dll dll$(LIBNAME).$(A) lib$(LIBNAME).$(A) $(INSTALLDIR)
-	echo $(INSTALLDIR) >> $(LIBDIR)/ld.conf
+	cp dll$(LIBNAME).dll $(STUBLIBDIR)/stublibs/dll$(LIBNAME).dll 
+	cp dll$(LIBNAME).$(A) lib$(LIBNAME).$(A) $(INSTALLDIR)
 
 clean : 
 	rm -f *.cm* *.$(O) *.dll *.$(A) *.exp
diff --git a/otherlibs/labltk/tkanim/Makefile b/otherlibs/labltk/tkanim/Makefile
index bd68de2992..4ae136a16d 100644
--- a/otherlibs/labltk/tkanim/Makefile
+++ b/otherlibs/labltk/tkanim/Makefile
@@ -54,7 +54,7 @@ clean:
 install: tkanim.cma 
 	cp tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
 	if [ -f dlltkanim.so ]; then \
-		cp dlltkanim.so $(INSTALLDIR); \
+		cp dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
 	fi
 
 installopt: tkanim.cmxa
diff --git a/otherlibs/labltk/tkanim/Makefile.nt b/otherlibs/labltk/tkanim/Makefile.nt
index 11039bcbc1..9c6da7ee2a 100644
--- a/otherlibs/labltk/tkanim/Makefile.nt
+++ b/otherlibs/labltk/tkanim/Makefile.nt
@@ -66,7 +66,8 @@ $(OBJS:.cmo=.cmx): ../lib/$(LIBNAME).cmxa
 	mv $*.$(O) $*.$(SO)
 
 install: tkanim.cma 
-	cp tkanim.cma *.cmi *.mli libtkanim.$(A) dlltkanim.dll $(INSTALLDIR)
+	cp dlltkanim.dll $(STUBLIBDIR)/dlltkanim.dll
+	cp tkanim.cma *.cmi *.mli libtkanim.$(A) $(INSTALLDIR)
 
 installopt: tkanim.cmxa
 	cp tkanim.cmxa tkanim.$(A) $(INSTALLDIR)
diff --git a/otherlibs/num/Makefile b/otherlibs/num/Makefile
index d14484a042..21525f91cc 100644
--- a/otherlibs/num/Makefile
+++ b/otherlibs/num/Makefile
@@ -53,7 +53,7 @@ $(BIGNUM_OBJS):
 $(CAMLOBJS:.cmo=.cmx): ../../ocamlopt
 
 install:
-	if test -f dllnums.so; then cp dllnums.so $(LIBDIR)/dllnums.so; fi
+	if test -f dllnums.so; then cp dllnums.so $(STUBLIBDIR)/dllnums.so; fi
 	cp libnums.a $(LIBDIR)/libnums.a
 	cd $(LIBDIR); $(RANLIB) libnums.a
 	cp nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)
diff --git a/otherlibs/num/Makefile.nt b/otherlibs/num/Makefile.nt
index e4a9a654a4..72e7970a92 100644
--- a/otherlibs/num/Makefile.nt
+++ b/otherlibs/num/Makefile.nt
@@ -58,7 +58,7 @@ bignum/dbignum.$(A) bignum/sbignum.$(A):
 $(CAMLOBJS:.cmo=.cmx): ../../ocamlopt
 
 install:
-	cp dllnums.dll $(LIBDIR)/dllnums.dll
+	cp dllnums.dll $(STUBLIBDIR)/dllnums.dll
 	cp libnums.$(A) $(LIBDIR)/libnums.$(A)
 	cp nums.cma $(CMIFILES) $(LIBDIR)
 
diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile
index e29b6880d3..22b440c192 100644
--- a/otherlibs/str/Makefile
+++ b/otherlibs/str/Makefile
@@ -53,7 +53,7 @@ clean: partialclean
 	cd $(REGEXLIB); if test -f Makefile; then $(MAKE) distclean; else exit 0; fi
 
 install:
-	if test -f dllstr.so; then cp dllstr.so $(LIBDIR)/dllstr.so; fi
+	if test -f dllstr.so; then cp dllstr.so $(STUBLIBDIR)/dllstr.so; fi
 	cp libstr.a $(LIBDIR)/libstr.a
 	cd $(LIBDIR); $(RANLIB) libstr.a
 	cp str.cma str.cmi str.mli $(LIBDIR)
diff --git a/otherlibs/str/Makefile.nt b/otherlibs/str/Makefile.nt
index 4cbffc65f9..ec7ac0559f 100644
--- a/otherlibs/str/Makefile.nt
+++ b/otherlibs/str/Makefile.nt
@@ -62,7 +62,7 @@ clean: partialclean
 	rm -f $(REGEXLIB)/*.$(O)
 
 install:
-	cp dllstr.dll $(LIBDIR)/dllstr.dll
+	cp dllstr.dll $(STUBLIBDIR)/dllstr.dll
 	cp libstr.$(A) $(LIBDIR)/libstr.$(A)
 	cp str.cma str.cmi $(LIBDIR)
 
diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
index d60439b39e..27a33d972d 100644
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -70,7 +70,7 @@ clean: partialclean
 	rm -f $(GENFILES)
 
 install:
-	if test -f dllthreads.so; then cp dllthreads.so $(LIBDIR)/dllthreads.so; fi
+	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
 	cp libthreads.a $(LIBDIR)/libthreads.a
 	cd $(LIBDIR); $(RANLIB) libthreads.a
 	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt
index d5141ad6d2..530a08e5eb 100644
--- a/otherlibs/systhreads/Makefile.nt
+++ b/otherlibs/systhreads/Makefile.nt
@@ -70,7 +70,7 @@ clean: partialclean
 	rm -f $(GENFILES)
 
 install:
-	cp dllthreads.dll $(LIBDIR)/dllthreads.dll
+	cp dllthreads.dll $(STUBLIBDIR)/dllthreads.dll
 	cp libthreads.$(A) $(LIBDIR)/libthreads.$(A)
 	mkdir -p $(LIBDIR)/threads
 	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile
index 6c3324c6cc..3fe57f3035 100644
--- a/otherlibs/threads/Makefile
+++ b/otherlibs/threads/Makefile
@@ -99,7 +99,7 @@ clean: partialclean
 	rm -f pervasives.mli marshal.mli unix.mli
 
 install:
-	if test -f dllthreads.so; then cp dllthreads.so $(LIBDIR)/dllthreads.so; fi
+	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
 	cp libthreads.a $(LIBDIR)/libthreads.a
 	cd $(LIBDIR); $(RANLIB) libthreads.a
 	if test -d $(LIBDIR)/threads; then : ; else mkdir $(LIBDIR)/threads; fi
diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile
index 7254cce95f..2121ce76df 100644
--- a/otherlibs/unix/Makefile
+++ b/otherlibs/unix/Makefile
@@ -65,7 +65,7 @@ clean: partialclean
 	rm -f *.a *.o *.so
 
 install:
-	if test -f dllunix.so; then cp dllunix.so $(LIBDIR)/dllunix.so; fi
+	if test -f dllunix.so; then cp dllunix.so $(STUBLIBDIR)/dllunix.so; fi
 	cp libunix.a $(LIBDIR)/libunix.a
 	cd $(LIBDIR); $(RANLIB) libunix.a
 	cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
diff --git a/otherlibs/win32graph/Makefile.nt b/otherlibs/win32graph/Makefile.nt
index 6a48a8fb2d..1274182614 100644
--- a/otherlibs/win32graph/Makefile.nt
+++ b/otherlibs/win32graph/Makefile.nt
@@ -55,7 +55,7 @@ clean: partialclean
 	rm -f io.h
 
 install:
-	cp dllgraphics.dll $(LIBDIR)/dllgraphics.dll
+	cp dllgraphics.dll $(STUBLIBDIR)/dllgraphics.dll
 	cp libgraphics.$(A) $(LIBDIR)/libgraphics.$(A)
 	cp graphics.cmi graphics.cma $(LIBDIR)
 
diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt
index c59cef2907..453a6e2020 100644
--- a/otherlibs/win32unix/Makefile.nt
+++ b/otherlibs/win32unix/Makefile.nt
@@ -80,7 +80,7 @@ clean: partialclean
 	rm -f $(UNIX_FILES) $(UNIX_CAML_FILES)
 
 install:
-	cp dllunix.dll $(LIBDIR)/dllunix.dll
+	cp dllunix.dll $(STUBLIBDIR)/dllunix.dll
 	cp libunix.$(A) $(LIBDIR)/libunix.$(A)
 	cp unix.cmi unix.cma $(LIBDIR)