Fix compilation with recent dune

4 files changed, 7 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index fe24f9e..6355f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 morsmall (0.3.0-5) UNRELEASED; urgency=medium
 
   * Bump standards-version to 4.6.2.
+  * Fix compilation with recent dune
 
  -- Julien Puydt <jpuydt@debian.org>  Thu, 06 Jul 2023 14:59:09 +0200
 
diff --git a/debian/libmorsmall-ocaml-dev.docs b/debian/libmorsmall-ocaml-dev.docs
index db05ff7..ba78fe8 100644
--- a/debian/libmorsmall-ocaml-dev.docs
+++ b/debian/libmorsmall-ocaml-dev.docs
@@ -1 +1 @@
-doc/morsmall/README.org
+usr/doc/morsmall/README.org
diff --git a/debian/libmorsmall-ocaml-dev.install b/debian/libmorsmall-ocaml-dev.install
index dadc0e8..2ab821a 100644
--- a/debian/libmorsmall-ocaml-dev.install
+++ b/debian/libmorsmall-ocaml-dev.install
@@ -1,2 +1,2 @@
 /usr/lib/ocaml/
-doc/_html/*	/usr/share/doc/libmorsmall-ocaml-dev/html
+_build/default/_doc/_html/*	/usr/share/doc/libmorsmall-ocaml-dev/html
diff --git a/debian/rules b/debian/rules
index cb79573..76d2c65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,18 +2,15 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
-INSTALLDIR=$(CURDIR)/debian/tmp
-
 %:
 	dh $@ --with ocaml
 
 override_dh_auto_build:
-	make
-	make doc
-	find -H doc -name ".dune-keep" -delete
+	dune build
+	dune build @doc
 
 override_dh_auto_install:
-	PREFIX=$(INSTALLDIR) LIBDIR=usr/lib/ocaml make install
-	dh_install
+	dune install --destdir=$(CURDIR)/debian/tmp --prefix=/usr --libdir=$(OCAML_STDLIB_DIR)
+	find $(CURDIR)/debian/tmp -name LICENSE -delete
 
 override_dh_dwz: