[Pkg-ocaml-maint-commits] [SCM] oasis2debian project branch, master, updated. 94ae27000298101188a629fbcc6b28420021fe10

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit e8585c4262f4fd076519eed28172d2aa81e5eae2
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Nov 20 00:32:48 2010 +0100

    Fix dll generation options

diff --git a/src/DhFiles.ml b/src/DhFiles.ml
index fb55ed3..2b26195 100644
--- a/src/DhFiles.ml
+++ b/src/DhFiles.ml
@@ -58,7 +58,9 @@ let create ~ctxt t =
            
          (* Has_dll *)
          let has_dll = 
-           List.exists (fun fn -> String.ends_with fn ".so") generated_files
+           List.exists 
+             (fun fn -> String.ends_with fn ".so") 
+             generated_files
          in
 
            findlib_name, has_dll)
@@ -219,8 +221,15 @@ OPT: @OCamlStdlibDir@/$findlib_name/*.cmxa")
               dh_with_fn deb_runtime "install.in"
                 (fun chn ->
                    (* At least one findlib root has a dll *)
-                   if List.exists snd roots then
-                     output_content "@OCamlDllDir@/*.so" chn;
+                   List.iter 
+                     (function 
+                        | (findlib_name, true) ->
+                            output_content 
+                              ("@OCamlStdlibDir@/"^findlib_name^"/*.so @OCamlDllDir@")
+                              chn
+                        | (_, false) ->
+                            ())
+                     roots;
 
                    List.iter 
                      (fun (findlib_name, has_dll) ->
diff --git a/src/Rules.ml b/src/Rules.ml
index 52d7c13..a1c2673 100644
--- a/src/Rules.ml
+++ b/src/Rules.ml
@@ -40,6 +40,8 @@ include /usr/share/ocaml/ocamlvars.mk
 
 OCAMLFIND_DESTDIR=\$(DESTDIR)/\$(OCAML_STDLIB_DIR)
 export OCAMLFIND_DESTDIR
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
 
 %:
 	dh --with ocaml \$@

-- 
oasis2debian project