- set ocamldoc to look in netstring directory so that it's able to find

  Neturl.url definition
- bugfix: don't try anymore to install no longer existing http_types.mli

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 5a63b43229ef13c96c9d2ab99b2ab9c788caa71a..94e38968584fb865b722fb6753c9f33c8b308c0e 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -7,7 +7,8 @@ MODULES =       \
 THREADED_SRV = http_threaded_tcp_server
 MODULES_MT = $(patsubst http_tcp_server, mt/$(THREADED_SRV) http_tcp_server, $(MODULES))
 MODULES_NON_MT = $(patsubst http_tcp_server, non_mt/$(THREADED_SRV) http_tcp_server, $(MODULES))
-PUBLIC_MODULES = http_common http_types http_request http_daemon http_response
+PUBLIC_MODULES = http_common http_request http_daemon http_response
+PUBLIC_IMPL = http_types
 DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
 
 all: all_non_mt all_mt
@@ -18,7 +19,8 @@ all_mt: http_mt.cma
 opt_mt: http_mt.cmxa
 world: all opt
 doc: *.mli
-       $(OCAMLDOC) -html -d doc/html *.mli
+       $(OCAMLDOC) -html -d doc/html   \
+               *.mli $(patsubst %, %.ml, $(PUBLIC_IMPL))
 
 examples:
        $(MAKE) -C examples/
@@ -80,11 +82,13 @@ dist: distreal distrm
 distreal: distclean depend
        if [ -d $(DISTDIR) ]; then rm -rf $(DISTDIR); else true; fi
        mkdir $(DISTDIR)
-       cp -r   \
-               $(patsubst %, %.ml, $(MODULES)) \
-               $(patsubst %, %.mli, $(MODULES) $(THREADED_SRV))        \
-               mt/ non_mt/ $(EXTRA_DIST) examples/     debian/ \
-               $(DISTDIR)/
+       for f in        \
+                       $(patsubst %, %.ml, $(MODULES)) \
+                       $(patsubst %, %.mli, $(MODULES) $(THREADED_SRV))        \
+                       mt/ non_mt/ $(EXTRA_DIST) examples/     debian/;        \
+       do      \
+               cp -r $$f $(DISTDIR)/;  \
+       done
        -find $(DISTDIR)/ -type d -name CVS -exec rm -rf {} \;
        -find $(DISTDIR)/ -type f -name ".cvs*" -exec rm -f {} \;
        tar cvzf $(DISTDIR).tar.gz $(DISTDIR)/
@@ -96,6 +100,7 @@ deb: distreal
 install: META
        $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)     \
                $(patsubst %, %.mli, $(PUBLIC_MODULES)) \
+               $(patsubst %, %.ml, $(PUBLIC_IMPL))     \
                $(patsubst %, %.cmi, $(PUBLIC_MODULES)) \
                http{,_mt}.cm{,x}a http{,_mt}.a META
 

diff --git a/helm/DEVEL/ocaml-http/Makefile.defs b/helm/DEVEL/ocaml-http/Makefile.defs
index 8884bfd3d2bbbf8c5bbac6e2b8c1cd5f811912ca..642a7acb5fbd5f7cd42b488695067a80dcad3e74 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile.defs
+++ b/helm/DEVEL/ocaml-http/Makefile.defs
@@ -9,11 +9,12 @@ OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_FLAGS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMON_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMON_FLAGS)
-OCAMLDOC = ocamldoc
+OCAMLDOC := ocamldoc -I $(shell $(OCAMLFIND) query netstring)
 
 DISTNAME = ocaml-http
 DISTDIR = $(DISTNAME)-$(DISTVERSION)
 EXTRA_DIST =   \
-       INSTALL LICENSE README META.in Makefile Makefile.defs .depend tophttp doc
+       INSTALL LICENSE README META.in Makefile Makefile.defs Makefile.overrides        \
+       .depend tophttp doc