[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging branch, master, updated. debian/1.3.4-2-28-g34cf114

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a20ef91c68895e13654ef2e3afab5d64b76eac08
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jan 17 07:35:00 2012 +0100

    Fix bytecode build
    
    We don't build native code when natdynlink is not available, for now.

diff --git a/debian/libocsigenserver-ocaml-dev.install.in b/debian/libocsigenserver-ocaml-dev.install.in
index 0536b85..943c11a 100644
--- a/debian/libocsigenserver-ocaml-dev.install.in
+++ b/debian/libocsigenserver-ocaml-dev.install.in
@@ -7,11 +7,11 @@
 @OCamlStdlibDir@/ocsigenserver/ocsigen_cookies.cmo
 @OCamlStdlibDir@/ocsigenserver/ocsigenserver.cma
 @OCamlStdlibDir@/ocsigenserver/server_main.cmo
-OPT: @OCamlStdlibDir@/ocsigenserver/*.o
-OPT: @OCamlStdlibDir@/ocsigenserver/*.cmx
-OPT: @OCamlStdlibDir@/ocsigenserver/*.a
-OPT: @OCamlStdlibDir@/ocsigenserver/*.cmxa
-OPT: @OCamlStdlibDir@/ocsigenserver/*/*.o
-OPT: @OCamlStdlibDir@/ocsigenserver/*/*.cmx
-OPT: @OCamlStdlibDir@/ocsigenserver/*/*.a
-OPT: @OCamlStdlibDir@/ocsigenserver/*/*.cmxa
+DYN: @OCamlStdlibDir@/ocsigenserver/*.o
+DYN: @OCamlStdlibDir@/ocsigenserver/*.cmx
+DYN: @OCamlStdlibDir@/ocsigenserver/*.a
+DYN: @OCamlStdlibDir@/ocsigenserver/*.cmxa
+DYN: @OCamlStdlibDir@/ocsigenserver/*/*.o
+DYN: @OCamlStdlibDir@/ocsigenserver/*/*.cmx
+DYN: @OCamlStdlibDir@/ocsigenserver/*/*.a
+DYN: @OCamlStdlibDir@/ocsigenserver/*/*.cmxa
diff --git a/debian/libocsigenserver-ocaml.install.in b/debian/libocsigenserver-ocaml.install.in
index 653644f..99300c7 100644
--- a/debian/libocsigenserver-ocaml.install.in
+++ b/debian/libocsigenserver-ocaml.install.in
@@ -19,7 +19,7 @@
 @OCamlStdlibDir@/ocsigenserver/extensions/accesscontrol.cmo
 @OCamlStdlibDir@/ocsigenserver/extensions/extendconfiguration.cmo
 @OCamlStdlibDir@/ocsigenserver/extensions/ocsidbm
-OPT: @OCamlStdlibDir@/ocsigenserver/extensions/ocsidbm.opt
+DYN: @OCamlStdlibDir@/ocsigenserver/extensions/ocsidbm.opt
 DYN: @OCamlStdlibDir@/ocsigenserver/parsecommandline.cmxs
 DYN: @OCamlStdlibDir@/ocsigenserver/polytables.cmxs
 DYN: @OCamlStdlibDir@/ocsigenserver/donotparsecommandline.cmxs
diff --git a/debian/ocsigenserver.links b/debian/ocsigenserver.links
deleted file mode 100644
index cd6984c..0000000
--- a/debian/ocsigenserver.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man1/ocsigenserver.1.gz		usr/share/man/man1/ocsigenserver.opt.1.gz
diff --git a/debian/ocsigenserver.links.in b/debian/ocsigenserver.links.in
new file mode 100644
index 0000000..87fa020
--- /dev/null
+++ b/debian/ocsigenserver.links.in
@@ -0,0 +1 @@
+DYN: usr/share/man/man1/ocsigenserver.1.gz		usr/share/man/man1/ocsigenserver.opt.1.gz
diff --git a/debian/rules b/debian/rules
index 08e12ee..30de511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,16 @@ else
   OPT_CONFFLAGS := --disable-natdynlink
 endif
 
+# This should test OCAML_HAVE_OCAMLOPT, but camlp4 usage seems to
+# force dynlink...
+ifeq ($(OCAML_NATDYNLINK),yes)
+  BUILD_TARGET := all
+  INSTALL_TARGET := install
+else
+  BUILD_TARGET := byte
+  INSTALL_TARGET := install.byte
+endif
+
 BUILD_DOC := $(if $(findstring ocsigenserver-doc,$(shell dh_listpackages)),yes,no)
 
 %:
@@ -36,14 +46,14 @@ override_dh_auto_configure:
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE)
+	$(MAKE) $(BUILD_TARGET)
 ifeq ($(BUILD_DOC),yes)
 	$(MAKE) doc
 endif
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	$(MAKE) install CHOWN=/bin/true OCSIGENUSER=root OCSIGENGROUP=root
+	$(MAKE) $(INSTALL_TARGET) CHOWN=/bin/true OCSIGENUSER=root OCSIGENGROUP=root
 	$(MAKE) logrotate
 ifeq ($(BUILD_DOC),yes)
 	$(MAKE) install.doc

-- 
ocsigenserver packaging