Update build system

9 files changed, 16 insertions, 27 deletions

diff --git a/debian/libaac-tactics-coq.doc-base.api b/debian/libaac-tactics-coq.doc-base.api
deleted file mode 100644
index 97c229f..0000000
--- a/debian/libaac-tactics-coq.doc-base.api
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: aac-tactics-api-reference
-Title: aac_tactics API Reference
-Abstract: API reference for aac_tactics (generated from ML sources via OCamldoc)
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libaac-tactics-coq/api/index.html
-Files: /usr/share/doc/libaac-tactics-coq/api/*
diff --git a/debian/libaac-tactics-coq.install b/debian/libaac-tactics-coq.install
new file mode 100644
index 0000000..ea6c204
--- /dev/null
+++ b/debian/libaac-tactics-coq.install
@@ -0,0 +1,2 @@
+                          /usr/lib/coq/user-contrib/AAC_tactics/*.vo
+html/*                    /usr/share/doc/libaac-tactics-coq/theories
diff --git a/debian/libaac-tactics-coq.install.in b/debian/libaac-tactics-coq.install.in
deleted file mode 100644
index 42cf10a..0000000
--- a/debian/libaac-tactics-coq.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-*.vo                      /usr/lib/coq/user-contrib/AAC_tactics/
-doc/*                     /usr/share/doc/libaac-tactics-coq/api
-html/*                    /usr/share/doc/libaac-tactics-coq/theories
diff --git a/debian/libaac-tactics-ocaml-dev.install b/debian/libaac-tactics-ocaml-dev.install
new file mode 100644
index 0000000..18a9b3c
--- /dev/null
+++ b/debian/libaac-tactics-ocaml-dev.install
@@ -0,0 +1,2 @@
+         usr/lib/coq/user-contrib/AAC_tactics/*.cmi
+*.mli    usr/lib/coq/user-contrib/AAC_tactics/
diff --git a/debian/libaac-tactics-ocaml-dev.install.in b/debian/libaac-tactics-ocaml-dev.install.in
deleted file mode 100644
index 74548b3..0000000
--- a/debian/libaac-tactics-ocaml-dev.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-*.cmi                     /usr/lib/coq/user-contrib/AAC_tactics/
-*.mli                     /usr/lib/coq/user-contrib/AAC_tactics/
-OPT: *.cmx                /usr/lib/coq/user-contrib/AAC_tactics/
-OPT: *.cmxa               /usr/lib/coq/user-contrib/AAC_tactics/
-OPT: *.a                  /usr/lib/coq/user-contrib/AAC_tactics/
diff --git a/debian/libaac-tactics-ocaml-dev.lintian-overrides b/debian/libaac-tactics-ocaml-dev.lintian-overrides
new file mode 100644
index 0000000..b102d8b
--- /dev/null
+++ b/debian/libaac-tactics-ocaml-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# aac.cmo is a pack
+libaac-tactics-ocaml-dev: ocaml-dangling-cmi usr/lib/coq/user-contrib/AAC_tactics/aac.cmi
diff --git a/debian/libaac-tactics-ocaml-dev.ocamldoc b/debian/libaac-tactics-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..83a7cff
--- /dev/null
+++ b/debian/libaac-tactics-ocaml-dev.ocamldoc
@@ -0,0 +1,3 @@
+-rectypes
+-I /usr/lib/coq/kernel -I /usr/lib/coq/proofs -I /usr/lib/coq/pretyping
+--include debian/libaac-tactics-ocaml-dev/usr/lib/coq
diff --git a/debian/libaac-tactics-ocaml.install.in b/debian/libaac-tactics-ocaml.install.in
index 2ede221..b6795bd 100644
--- a/debian/libaac-tactics-ocaml.install.in
+++ b/debian/libaac-tactics-ocaml.install.in
@@ -1,2 +1,2 @@
-aac_tactics.cma           /usr/lib/coq/user-contrib/AAC_tactics/
-DYN: aac_tactics.cmxs     /usr/lib/coq/user-contrib/AAC_tactics/
+     usr/lib/coq/user-contrib/AAC_tactics/*.cmo
+DYN: usr/lib/coq/user-contrib/AAC_tactics/*.cmxs
diff --git a/debian/rules b/debian/rules
index da4c4c4..792a1d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,22 +6,18 @@ include /usr/share/coq/coqvars.mk
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-	./make_makefile
-
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 	$(MAKE) world
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-# install rule as generated by coq_makefile is buggy
+	$(MAKE) -f Makefile.coq install DSTROOT=$(CURDIR)/debian/tmp
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing
 
 .PHONY: override_dh_gencontrol
 override_dh_gencontrol:
 	dh_gencontrol -- -VF:CoqABI="$(COQ_ABI)"
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	rm -Rf .depend *.glob *.d *.*o *.*a *.cm* doc html