[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.12.5-1-12-g4e580ca

[Stephane Glondu]

The following commit has been merged in the master branch:
commit bf3aa7af4e4db3871c5bc4b06f52d7039fdd1a01
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Feb 20 16:42:35 2011 +0100

    Handle the possibily of no natdynlink

diff --git a/debian/control b/debian/control
index e6228c7..00d5243 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
  libpq-dev,
- dh-ocaml (>= 0.9~),
+ dh-ocaml (>= 0.9.6~),
  cdbs
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/postgresql-ocaml.git
diff --git a/debian/libpostgresql-ocaml.install.in b/debian/libpostgresql-ocaml.install.in
index 580061f..2b649b9 100644
--- a/debian/libpostgresql-ocaml.install.in
+++ b/debian/libpostgresql-ocaml.install.in
@@ -1,4 +1,4 @@
 debian/tmp at OCamlStdlibDir@/postgresql/*.so @OCamlDllDir@
 @OCamlStdlibDir@/postgresql/META
 @OCamlStdlibDir@/postgresql/*.cma
-OPT: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql
+DYN: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql
diff --git a/debian/rules b/debian/rules
index 8b52820..94aa82f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) NO_CUSTOM=y -C $(DEB_SRCDIR)/ native-code-library
+endif
+
+ifeq ($(OCAML_NATDYNLINK),yes)
+build/$(PKGNAME)::
 	cd $(DEB_SRCDIR) && ocamlopt -shared -I . -o postgresql.cmxs -linkall postgresql.cmxa
 endif
 

-- 
postgresql-ocaml packaging