[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.3-1-6-g0a1367f

Stephane Glondu steph at glondu.net
Tue Feb 15 18:24:17 UTC 2011


The following commit has been merged in the master branch:
commit ff9553ad57e3786379376bcccac5809ba2af9ba4
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 15 18:44:21 2011 +0100

    Do not compile native code version if there is no natdynlink

diff --git a/debian/control b/debian/control
index ac1ffa2..c2be078 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  libcryptokit-ocaml-dev (>= 1.3-14~),
  libobrowser-ocaml-dev,
  ocamlduce (>= 3.11.1.0-2~),
- dh-ocaml (>= 0.9)
+ dh-ocaml (>= 0.9.5~)
 Standards-Version: 3.8.4
 Homepage: http://www.ocsigen.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocsigen.git
diff --git a/debian/rules b/debian/rules
index ef6bf7c..66caaee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlvars.mk
 DESTDIR := $(CURDIR)/debian/tmp
 export OCAMLOBJINFO := ocamlduceobjinfo
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_NATDYNLINK),yes)
   OPT_CONFFLAGS := --enable-nativecode
 else
   OPT_CONFFLAGS := --disable-nativecode

-- 
ocsigen packaging



More information about the Pkg-ocaml-maint-commits mailing list