ocaml 3.09 transition

[helm.git] / helm / DEVEL / ocaml-http / Makefile.defs

diff --git a/helm/DEVEL/ocaml-http/Makefile.defs b/helm/DEVEL/ocaml-http/Makefile.defs
index 642a7acb5fbd5f7cd42b488695067a80dcad3e74..4d9f7c5ca2116d275e6d309f62dfd88a9f579b3e 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile.defs
+++ b/helm/DEVEL/ocaml-http/Makefile.defs
@@ -1,20 +1,24 @@
 PKGNAME = http
-DISTVERSION = $(shell dpkg-parsechangelog | egrep '^Version: ' | sed 's/^Version: //')
+DISTVERSION = $(shell dpkg-parsechangelog | egrep '^Version: ' | sed 's/^Version: //' | sed 's/-.*//')
 
 DEBUG_FLAGS =
-REQUIRES = unix pcre netstring
+REQUIRES = unix str pcre netstring
 COMMON_FLAGS = $(DEBUG_FLAGS) -pp camlp4o -package "$(REQUIRES)"
 THREADS_FLAGS = -package threads -thread
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_FLAGS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMON_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMON_FLAGS)
-OCAMLDOC := ocamldoc -I $(shell $(OCAMLFIND) query netstring)
+OCAMLDOC :=                                                    \
+       ocamldoc -stars                                         \
+               $(shell $(OCAMLFIND) query -i-format unix)      \
+               $(shell $(OCAMLFIND) query -i-format pcre)      \
+               $(shell $(OCAMLFIND) query -i-format netstring)
+DOT = dot
 
 DISTNAME = ocaml-http
 DISTDIR = $(DISTNAME)-$(DISTVERSION)
 EXTRA_DIST =   \
-       INSTALL LICENSE README META.in Makefile Makefile.defs Makefile.overrides        \
-       .depend tophttp doc
-
+       INSTALL LICENSE README META.in Makefile Makefile.defs   \
+       .depend