ship ocaml-native-compilers.conf to configure findlib to use native compilers

diff --git a/debian/changelog b/debian/changelog
index 24fd9e7be86fc4cca905457c8d8d3e636938f13d..897eebf9164f416218085cdd96297d3325f87ed0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,5 @@
 ocaml (3.08.3-8) UNRELEASED; urgency=low
 
-  Changes by Stefano Zacchiroli:
-  * debian/rules
-    - remove spurious CVS directories from labltk examples
-      (Closes: Bug#322712)
-  
   Changes by Jérôme Marant:
   * Create a new `ocaml-mode' package dedicated at Emacs-related files
   * debian/control:
@@ -39,6 +34,15 @@ ocaml (3.08.3-8) UNRELEASED; urgency=low
     - New files
   * debian/rules: Update ocaml-md5sum files location accordingly
   
+  Changes by Stefano Zacchiroli:
+  * debian/rules
+    - remove spurious CVS directories from labltk examples
+      (Closes: Bug#322712)
+  * debian/ocamlfind/ocaml-native-compilers.conf
+    - gets installed under /usr/share/ocaml-findlib/ so that, if
+      ocamlfind is available, compiling with findlib will use the
+      native compilers
+  
  -- Jerome Marant <jerome@debian.org>  Sat, 20 Aug 2005 13:34:52 +0200
 
 ocaml (3.08.3-7) unstable; urgency=low

diff --git a/debian/ocaml-native-compilers.dirs b/debian/ocaml-native-compilers.dirs
index 98d15831b4c595219d8284ae176a23d8860cce9e..145ce2ad19e55131a1786a1eaa87757ed8929868 100644 (file)
--- a/debian/ocaml-native-compilers.dirs
+++ b/debian/ocaml-native-compilers.dirs
@@ -1,2 +1,3 @@
 usr/bin
 usr/share/man/man1
+usr/share/ocaml-findlib

diff --git a/debian/ocamlfind/ocaml-native-compilers.conf b/debian/ocamlfind/ocaml-native-compilers.conf
new file mode 100644 (file)
index 0000000..8a7665e
--- /dev/null
+++ b/debian/ocamlfind/ocaml-native-compilers.conf
@@ -0,0 +1,2 @@
+ocamlc="ocamlc.opt"
+ocamlopt="ocamlopt.opt"

diff --git a/debian/rules b/debian/rules
index 7715619c7c666153420b0a5791edf2d31d6d70ea..ad6e676b2bb87c585a87a15e246d2ec707007684 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -176,6 +176,8 @@ install-arch:
        if [ -e opt-built-stamp ]; then                                 \
                dh_movefiles -pocaml-native-compilers                   \
                        --sourcedir=debian/ocaml-nox;                   \
+               cp debian/ocamlfind/ocaml-native-compilers.conf         \
+                       debian/ocaml-native-compilers/usr/share/ocaml-findlib/; \
        fi
 
        # The interpreter files