[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.2.0-1-1-gb9fecf9

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b9fecf9cfbe09d6b0ebb2023edf593cb6c582022
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 2 09:04:22 2009 +0200

    Fix build on non-native architectures

diff --git a/debian/changelog b/debian/changelog
index 109d2fd..37e9857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocsigen (1.2.0-2) unstable; urgency=low
+
+  * Fix build on non-native architectures
+
+ -- Stephane Glondu <steph at glondu.net>  Thu, 02 Jul 2009 10:02:08 +0200
+
 ocsigen (1.2.0-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/rules b/debian/rules
index 1d22b04..2186be7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,12 @@ DESTDIR := $(CURDIR)/debian/tmp
 PACKAGES := $(shell sed -nr 's/^Package: (.*)$$/\1/p' debian/control)
 DH := dh --with quilt
 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+  OPT_CONFFLAGS := --enable-nativecode
+else
+  OPT_CONFFLAGS := --disable-nativecode
+endif
+
 override_dh_auto_configure:
 	chmod +x configure
 	./configure \
@@ -24,6 +30,7 @@ override_dh_auto_configure:
 	    --ocsigen-user ocsigen \
 	    --ocsigen-group ocsigen \
 	    --stubdir $(OCAML_DLL_DIR) \
+	    $(OPT_CONFFLAGS) \
 	    --enable-ocamlduce
 	cp -a examples debian
 # Remove irrelevant files (incl. those installed in /usr/share or /var/lib)

-- 
ocsigen packaging