[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.2.2-1-1-gf7b62c7

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f7b62c7dda03d5b3fdce38a0fa86f2fb37dbddc8
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 14 23:46:11 2010 +0200

    Partially revert "Release to unstable"

diff --git a/Makefile b/Makefile
index 5a136d6..b5101e2 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ VERSION := $(shell cat VERSION)
 
 # Define variables and export them for mkconf.ml
 DOCROOT ?= /usr/share/doc/ocaml-batteries
-PREFIX ?= $(shell ocamlc -where)
 export DOCROOT
 BROWSER_COMMAND ?= x-www-browser %s
 export BROWSER_COMMAND
@@ -50,16 +49,15 @@ clean:
 	$(OCAMLBUILD) -clean
 
 doc:
-	$(OCAMLBUILD) -no-hygiene batteries.docdir/index.html
+	$(OCAMLBUILD) batteries.docdir/index.html
 	test -e apidocs || ln -s _build/batteries.docdir apidocs
 
 install: all
-	ocamlfind install -destdir $(PREFIX) estring \
-		libs/estring/META \
+	ocamlfind install estring libs/estring/META \
 		_build/libs/estring/*.cmo \
 		_build/libs/estring/*.cmi \
 		_build/libs/estring/*.mli
-	ocamlfind install -destdir $(PREFIX) $(NAME) $(INSTALL_FILES)
+	ocamlfind install $(NAME) $(INSTALL_FILES)
 
 uninstall:
 	ocamlfind remove estring
diff --git a/src/syntax/pa_strings/pa_format.ml b/src/syntax/pa_strings/pa_format.ml
index aa402ca..0b40904 100644
--- a/src/syntax/pa_strings/pa_format.ml
+++ b/src/syntax/pa_strings/pa_format.ml
@@ -246,7 +246,7 @@ struct
         <:expr< fun paren out x -> BatIO.nwrite out "<abstract>" >>
     | <:ctyp at _loc< $id:id$ >> ->
         <:expr< $id:map_id id$ >>
-    | Ast.TyApp (_loc, b, a) ->
+    | <:ctyp at _loc< $a$ $b$ >> ->
         <:expr< $vprinter_of_ctyp b$ $vprinter_of_ctyp a$ >>
     | <:ctyp at _loc< $tup:t$ >> ->
         let l = Ast.list_of_ctyp t [] in

-- 
ocaml-batteries packaging