libdir transition to /usr/lib/ocaml/<version>

diff --git a/helm/DEVEL/ocaml-http/debian/control b/helm/DEVEL/ocaml-http/debian/control
index 3135b97f3a021decd28437850f73cc6832fd8d53..afb99182ba666b5a5ad9aee04405ec368b20c8b2 100644 (file)
--- a/helm/DEVEL/ocaml-http/debian/control
+++ b/helm/DEVEL/ocaml-http/debian/control
@@ -2,12 +2,12 @@ Source: ocaml-http
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-3.06, ocaml-findlib, libpcre-ocaml-dev-4.30.0, libocamlnet-ocaml-dev-0.94
+Build-Depends: debhelper (>> 4.0.0), ocaml-3.06-1, ocaml-findlib, libpcre-ocaml-dev-4.30.0, libocamlnet-ocaml-dev-0.94
 Standards-Version: 3.5.8
 
 Package: libhttp-ocaml-dev
 Architecture: any
-Depends: ocaml-3.06, libpcre-ocaml-dev-4.30.0, libocamlnet-ocaml-dev-0.94
+Depends: ocaml-3.06-1, libpcre-ocaml-dev-4.30.0, libocamlnet-ocaml-dev-0.94
 Provides: libhttp-ocaml-dev-0.0.6
 Description: OCaml module to build simple HTTP servers
  OCaml module to build simple HTTP server, largely inspired to Perl's

diff --git a/helm/DEVEL/ocaml-http/debian/dirs b/helm/DEVEL/ocaml-http/debian/dirs
index dd25148a47e377c553185405584a78802d5e6655..bfe42fe0e1edcaacbd16791e434173c658b1b095 100644 (file)
--- a/helm/DEVEL/ocaml-http/debian/dirs
+++ b/helm/DEVEL/ocaml-http/debian/dirs
@@ -1 +1 @@
-/usr/lib/ocaml
+/usr/lib/ocaml/3.06

diff --git a/helm/DEVEL/ocaml-http/debian/rules b/helm/DEVEL/ocaml-http/debian/rules
index 1d19eea2189ae2c08f2d8d87dda5443aeb876232..498a5540e8589ad500c36048827361d959efbb6b 100755 (executable)
--- a/helm/DEVEL/ocaml-http/debian/rules
+++ b/helm/DEVEL/ocaml-http/debian/rules
@@ -3,7 +3,8 @@
 #export DH_VERBOSE=1
 export DH_COMPAT=4
 
-TARGETDIR=$(CURDIR)/debian/libhttp-ocaml-dev
+TARGETDIR = $(CURDIR)/debian/libhttp-ocaml-dev
+OCAML_LIB_DIR = $(shell ocamlc -where)
 
 build: build-stamp
 build-stamp:
@@ -24,7 +25,7 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       $(MAKE) install DESTDIR=$(TARGETDIR)/usr/lib/ocaml
+       $(MAKE) install DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
        $(MAKE) doc
 
 binary-arch: build install