[Pkg-ocaml-maint-commits] [SCM] ocaml-res packaging branch, master, updated. debian/3.1.1-1-1-g0be13b0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0be13b04efdb5a4c592ef009f0e9c0353fcdc57a
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Mar 16 08:40:16 2009 +0100

    Update upstream patch to make it work on bytecode archs

diff --git a/OCamlMakefile b/OCamlMakefile
index e9e0753..5fc303e 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:
 	$(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/debian/changelog b/debian/changelog
index eb1e243..0f58972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-res (3.1.1-2) unstable; urgency=low
+
+  * Update upstream patch to make it work on bytecode archs
+
+ -- Stephane Glondu <steph at glondu.net>  Mon, 16 Mar 2009 08:42:21 +0100
+
 ocaml-res (3.1.1-1) unstable; urgency=low
 
   [ Mehdi Dogguy ]
diff --git a/lib/Makefile b/lib/Makefile
index 64c3ee3..2263ad6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -10,16 +10,12 @@ RESULT  = res
 LIBINSTALL_FILES = res.mli strat.mli pres_intf.mli nopres_intf.mli \
                    strat.cmi pres_intf.cmi nopres_intf.cmi weak_intf.cmi \
 		   res.cmi res.cma res.cmxa res.a
-LIBINSTALL_BC_FILES := $(filter-out %.a,$(filter-out %.cmxa,$(LIBINSTALL_FILES)))
 
 all:	byte-code-library native-code-library
 
 install:	libinstall
 uninstall:	libuninstall
 
-libinstall-byte-code: LIBINSTALL_FILES = $(LIBINSTALL_BC_FILES)
-libinstall-byte-code: libinstall
-
 clean::  clean-doc
 
 -include $(OCAMLMAKEFILE)

-- 
ocaml-res packaging