[Pkg-ocaml-maint-commits] [SCM] ocaml-inotify packaging branch, master, updated. 84cd6823a62cf5a4b3b75e66060527af6afbdac6

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 91ba11a279cc3e7f32c24a4da66a4d5273cdf46c
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Jun 8 16:22:05 2008 +0200

    Patch to compile on non native arch.

diff --git a/debian/patches/00list b/debian/patches/00list
index 77b9cda..cf3b99b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_nogcc
 02_meta
+03_ocamlopt
diff --git a/debian/patches/03_ocamlopt.dpatch b/debian/patches/03_ocamlopt.dpatch
new file mode 100755
index 0000000..5ecb530
--- /dev/null
+++ b/debian/patches/03_ocamlopt.dpatch
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_ocamlopt.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad ocaml-inotify~/Makefile ocaml-inotify/Makefile
+--- ocaml-inotify~/Makefile	2008-06-08 16:19:48.000000000 +0200
++++ ocaml-inotify/Makefile	2008-06-08 16:20:08.000000000 +0200
+@@ -15,6 +15,10 @@
+ 
+ all: $(LIBS)
+ 
++all-byte: inotify.cmi inotify.cma
++
++all-opt: inotify.cmi inotify.cmxa inotify.cma
++
+ bins: $(PROGRAMS)
+ 
+ libs: $(LIBS)
+@@ -48,6 +52,12 @@
+ install: $(LIBS)
+ 	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore inotify META inotify.cmi inotify.mli inotify.cma inotify.cmxa *.a *.so *.cmx
+ 
++install-byte: 
++	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore inotify META inotify.cmi inotify.mli inotify.cma *.a *.so
++
++install-opt: 
++	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore inotify META inotify.cmi inotify.mli inotify.cma inotify.cmxa *.a *.so *.cmx
++
+ uninstall:
+ 	ocamlfind remove -destdir $(OCAMLDESTDIR) sqlite3
+ 
diff --git a/debian/rules b/debian/rules
index 2a5f622..8e2985e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,15 @@ DESTDIR_DEV=$(CURDIR)/debian/libinotify-ocaml-dev
 DESTDIR=$(CURDIR)/debian/libinotify-ocaml
 
 DEB_MAKE_CLEAN_TARGET    := clean
-DEB_MAKE_BUILD_TARGET    := all 
-DEB_MAKE_INSTALL_TARGET  := install \
-  OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    := all-opt 
+DEB_MAKE_INSTALL_TARGET  := install-opt 
+else
+DEB_MAKE_BUILD_TARGET    := all-byte 
+DEB_MAKE_INSTALL_TARGET  := install-byte 
+endif
+
+DEB_MAKE_INSTALL_TARGET  += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
 clean::
 	$(RM) '$(CURDIR)/debian/libinotify-ocaml-dev.dirs'

-- 
ocaml-inotify packaging