[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. bc5664e965a91cf134293d7ec2bb38cb77589dbc

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 1333df73c8609e6039ca8e30bde27a8a676242db
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Jun 28 18:58:23 2008 +0200

    Handle byte/opt compilation.
    
    Install *.cma in any case and install byte compiled mlvirsh executable
    when compiling in bytecode.

diff --git a/debian/patches/0001-add-destdir.patch b/debian/patches/0001-add-destdir.patch
index abc24e1..d1baf32 100644
--- a/debian/patches/0001-add-destdir.patch
+++ b/debian/patches/0001-add-destdir.patch
@@ -1,8 +1,8 @@
-diff --git a/libvirt/Makefile.in b/libvirt/Makefile.in
-index bca1cdf..9cc96f0 100644
---- a/libvirt/Makefile.in
-+++ b/libvirt/Makefile.in
-@@ -124,8 +124,15 @@ libvirt.cmi: libvirt.mli
+Index: ocaml-libvirt/libvirt/Makefile.in
+===================================================================
+--- ocaml-libvirt.orig/libvirt/Makefile.in	2008-06-28 18:50:51.000000000 +0200
++++ ocaml-libvirt/libvirt/Makefile.in	2008-06-28 18:55:32.000000000 +0200
+@@ -124,8 +124,15 @@
  libvirt_version.cmo: libvirt_version.cmi
  libvirt_version.cmi: libvirt_version.mli
  
@@ -18,14 +18,14 @@ index bca1cdf..9cc96f0 100644
 +install-opt:
 +	mkdir -p $(OCAMLDESTDIR)
 +	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore libvirt \
-+	  ../META *.so *.a *.cmx *.cmxa *.cmi *.mli
++	  ../META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli
  
  include ../Make.rules
-diff --git a/Makefile.in b/Makefile.in
-index da44e9c..8a74647 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -27,7 +27,7 @@ OCAMLDOCFLAGS	:= -html -sort
+Index: ocaml-libvirt/Makefile.in
+===================================================================
+--- ocaml-libvirt.orig/Makefile.in	2008-06-28 18:50:51.000000000 +0200
++++ ocaml-libvirt/Makefile.in	2008-06-28 18:55:32.000000000 +0200
+@@ -27,7 +27,7 @@
  
  SUBDIRS		= libvirt mlvirsh examples
  
@@ -34,18 +34,18 @@ index da44e9c..8a74647 100644
  	for d in $(SUBDIRS); do \
  	  $(MAKE) -C $$d $@; \
  	  if [ $$? -ne 0 ]; then exit 1; fi; \
-@@ -141,4 +141,4 @@ winupload:
+@@ -141,4 +141,4 @@
  force:
  
  .PHONY: all opt depend install clean distclean configure dist check-manifest \
 -	release release_stage_2 release_stage_3 force
 \ No newline at end of file
 +	release release_stage_2 release_stage_3 force
-diff --git a/examples/Makefile.in b/examples/Makefile.in
-index 6fd8093..9bed8ec 100644
---- a/examples/Makefile.in
-+++ b/examples/Makefile.in
-@@ -54,6 +54,6 @@ node_info.opt: node_info.cmx
+Index: ocaml-libvirt/examples/Makefile.in
+===================================================================
+--- ocaml-libvirt.orig/examples/Makefile.in	2008-06-28 18:50:51.000000000 +0200
++++ ocaml-libvirt/examples/Makefile.in	2008-06-28 18:55:32.000000000 +0200
+@@ -54,6 +54,6 @@
  	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
  	  ../libvirt/mllibvirt.cmxa -o $@ $<
  
@@ -53,11 +53,11 @@ index 6fd8093..9bed8ec 100644
 +install-opt install-byte:
  
  include ../Make.rules
-diff --git a/mlvirsh/Makefile.in b/mlvirsh/Makefile.in
-index 23d6e1e..779513c 100644
---- a/mlvirsh/Makefile.in
-+++ b/mlvirsh/Makefile.in
-@@ -84,7 +84,7 @@ mlvirsh.opt: $(XOBJS)
+Index: ocaml-libvirt/mlvirsh/Makefile.in
+===================================================================
+--- ocaml-libvirt.orig/mlvirsh/Makefile.in	2008-06-28 18:50:51.000000000 +0200
++++ ocaml-libvirt/mlvirsh/Makefile.in	2008-06-28 18:56:17.000000000 +0200
+@@ -84,10 +84,16 @@
  	  ../libvirt/mllibvirt.cmxa -o $@ $^
  endif
  
@@ -66,3 +66,12 @@ index 23d6e1e..779513c 100644
  	if [ -x mlvirsh.opt ]; then \
  	  mkdir -p $(DESTDIR)$(bindir); \
  	  $(INSTALL) -m 0755 mlvirsh.opt $(DESTDIR)$(bindir)/mlvirsh; \
+ 	fi
+ 
++install-byte:
++	if [ -x mlvirsh ]; then \
++	  mkdir -p $(DESTDIR)$(bindir); \
++	  $(INSTALL) -m 0755 mlvirsh $(DESTDIR)$(bindir)/mlvirsh; \
++	fi
++
+ include ../Make.rules
diff --git a/debian/rules b/debian/rules
index 7a0109f..6db2faf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,11 +28,11 @@ DESTDIR_DEV=$(CURDIR)/debian/libvirt-ocaml-dev
 DESTDIR=$(CURDIR)/debian/libvirt-ocaml
 
 DEB_MAKE_CLEAN_TARGET    := clean
+DEB_MAKE_BUILD_TARGET    := all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET    := opt
+DEB_MAKE_BUILD_TARGET    += opt
 DEB_MAKE_INSTALL_TARGET  := install-opt
 else
-DEB_MAKE_BUILD_TARGET    := all
 DEB_MAKE_INSTALL_TARGET  := install-byte
 endif
 DEB_MAKE_INSTALL_TARGET  += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" DESTDIR="$(DESTDIR_DEV)"

-- 
ocaml-libvirt packaging