[Pkg-ocaml-maint-commits] [SCM] ocaml-bitmatch packaging branch, master, updated. debian/1.9.7-1-1-gf3c193e

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 29242f12958b66c2bdc6d29860d2fc6dc542aed6
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Aug 9 21:35:35 2008 +0000

    Byte only compilation.

diff --git a/debian/patches/00list b/debian/patches/00list
index e69de29..c6007b0 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01-byte-compilation
diff --git a/debian/patches/01-byte-compilation.dpatch b/debian/patches/01-byte-compilation.dpatch
new file mode 100755
index 0000000..bf29dc8
--- /dev/null
+++ b/debian/patches/01-byte-compilation.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-byte-compilation.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow byte only compilation.
+
+ at DPATCH@
+diff -urNad ocaml-bitstring~/Makefile.in ocaml-bitstring/Makefile.in
+--- ocaml-bitstring~/Makefile.in	2008-08-09 20:43:05.000000000 +0000
++++ ocaml-bitstring/Makefile.in	2008-08-09 21:31:31.000000000 +0000
+@@ -25,6 +25,8 @@
+ OCAMLDOC	= @OCAMLDOC@
+ INSTALL		= @INSTALL@
+ 
++OCAMLBEST       = @OCAMLBEST@
++
+ pkg_cil		= @pkg_cil@
+ pkg_extlib	= @pkg_extlib@
+ 
+@@ -47,11 +49,14 @@
+ TESTS		= $(patsubst %.ml,%,$(wildcard tests/*.ml))
+ 
+ all:	bitstring.cma bitstring_persistent.cma \
+-	bitstring.cmxa bitstring_persistent.cmxa \
+ 	pa_bitstring.cmo \
+ 	bitstring-objinfo
+ 	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+ 
++ifeq ($(OCAMLBEST),opt)
++all:    bitstring.cmxa bitstring_persistent.cmxa 
++endif 
++
+ bitstring.cma: bitstring_types.cmo bitstring_config.cmo bitstring.cmo \
+ 	  bitmatch.cmo
+ 	$(OCAMLFIND) ocamlc -a -o $@ $^
+@@ -171,7 +176,7 @@
+ # Install.
+ 
+ install:
+-	ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a \
++	ocamlfind install bitstring META $(wildcard *.mli *.cmx *.cma *.cmxa *.a) \
+ 		bitstring.cmi \
+ 		bitstring_persistent.cmi \
+ 		pa_bitstring.cmo
diff --git a/debian/rules b/debian/rules
index 5f0ce85..efc695e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,14 +25,8 @@ include /usr/share/cdbs/1/class/ocaml.mk
 DESTDIR_DEV=$(CURDIR)/debian/libbitstring-ocaml-dev
 
 DEB_MAKE_CLEAN_TARGET    := distclean
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET    := all 
 DEB_MAKE_INSTALL_TARGET  := install 
-else
-# TODO
-DEB_MAKE_BUILD_TARGET    := all-byte 
-DEB_MAKE_INSTALL_TARGET  := install-byte 
-endif
 DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
 OCAML_OCAMLDOC_PACKAGES = libbitstring-ocaml-dev

-- 
ocaml-bitmatch packaging