[Pkg-ocaml-maint-commits] [SCM] js-of-ocaml packaging branch, master, updated. debian/1.0+dfsg-1-1-gced811f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit ced811fd5fbac8ed4aec61df2af4b652dd27c994
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Apr 23 13:41:21 2011 +0200

    Compiler bytecode js_of_ocaml on bytecode architectures

diff --git a/debian/changelog b/debian/changelog
index f295c5a..660e3e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+js-of-ocaml (1.0+dfsg-2) unstable; urgency=low
+
+  * Team upload.
+  * Do not compile native js_of_ocaml on bytecode architectures, use bytecode
+    version instead.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 23 Apr 2011 13:39:26 +0200
+
 js-of-ocaml (1.0+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #610392)
diff --git a/debian/rules b/debian/rules
index d254e3b..a4695c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 DESTDIR=$(CURDIR)/debian/tmp
 BINDIR=$(DESTDIR)/usr/bin
 DOCDIR=$(DESTDIR)/usr/share/doc/libjs-of-ocaml-dev
+COMPILER=$(shell sed -n "s/COMPILER=//p" Makefile.conf)
 
 include /usr/share/ocaml/ocamlvars.mk
 
@@ -13,6 +14,16 @@ export OCAMLFIND_LDCONF=ignore
 %:
 	dh $@ --with ocaml
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	make -C compiler
+else
+	make -C compiler compile
+	mv compiler/compile compiler/$(COMPILER)
+endif
+	make library runtime
+
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --list-missing

-- 
js-of-ocaml packaging