[Pkg-ocaml-maint-commits] [SCM] sexplib310 packaging branch, master, updated. debian/4.2.11-2

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 8da35ecd63bac40fbe6fd41ab63fab0543200f5e
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Feb 2 21:26:35 2009 +0100

    integrate OCamlMakefile changes

diff --git a/debian/patches/debian/byte-build.diff b/debian/patches/debian/byte-build.diff
index 7ac6c75..0e21670 100644
--- a/debian/patches/debian/byte-build.diff
+++ b/debian/patches/debian/byte-build.diff
@@ -6,9 +6,10 @@ add Makefile targets to build/install bytecode objects only
 Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
 
 ---
- Makefile     |    9 +++++++++
- lib/Makefile |    5 +++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
+ Makefile      |    9 +++++++++
+ OCamlMakefile |    2 +-
+ lib/Makefile  |    5 +++++
+ 3 files changed, 15 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 4c67b1a..3d0ecd8 100644
@@ -34,6 +35,19 @@ index 4c67b1a..3d0ecd8 100644
  .PHONY:	uninstall
  uninstall:
  	@cd lib && $(MAKE) $@
+diff --git a/OCamlMakefile b/OCamlMakefile
+index e9e0753..a21696b 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -1182,7 +1182,7 @@ libinstall:	all
+ 	$(QUIET)printf "\nInstallation successful.\n"
+ 
+ .PHONY: libinstall-byte-code
+-libinstall-byte-code:	all
++libinstall-byte-code:	byte-code
+ 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
+ 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
+ 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
 diff --git a/lib/Makefile b/lib/Makefile
 index 40037a3..f5ea4b6 100644
 --- a/lib/Makefile

-- 
sexplib310 packaging