[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 63b1be9fb09f74bd89d50d1552dc03f310cb0121
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Fri Nov 19 13:46:14 2010 +0100

    Avoid double installation of .cma files

diff --git a/src/DhFiles.ml b/src/DhFiles.ml
index 5b39d5c..7fcf307 100644
--- a/src/DhFiles.ml
+++ b/src/DhFiles.ml
@@ -102,8 +102,9 @@ let create ~ctxt t =
                         output_content 
                           (interpolate 
                              "\
- at OCamlStdlibDir@/$findlib_name/*.cm*
- at OCamlStdlibDir@/$findlib_name/*.ml*")
+ at OCamlStdlibDir@/$findlib_name/*.cm[ix]
+ at OCamlStdlibDir@/$findlib_name/*.ml*
+OPT: @OCamlStdlibDir@/$findlib_name/*.cmxa")
                           chn;
 
                         output_content
@@ -128,7 +129,7 @@ let create ~ctxt t =
                           (interpolate 
                              "\
 @OCamlStdlibDir@/$findlib_name/META
- at OCamlStdlibDir@/$findlib_name/*.cma")
+ at OCamlStdlibDir@/$findlib_name/*.cm[ao]")
                           chn)
                      roots)
             end

-- 
oasis2debian project