From: Stefano Zacchiroli <zack@debian.org>
Date: Fri, 2 Sep 2005 23:05:44 +0000 (+0000)
Subject: ship ocaml-native-compilers.conf to configure findlib to use native compilers
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~734
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aee80cd5f15d9295b33a5fedeff30bda27ed8680;p=ocaml.git

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

diff --git a/debian/changelog b/debian/changelog
index 24fd9e7b..897eebf9 100644
--- 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 98d15831..145ce2ad 100644
--- 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
index 00000000..8a7665ef
--- /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 7715619c..ad6e676b 100755
--- 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