Simplify handling of dispatch to binary packages

5 files changed, 22 insertions, 9 deletions

diff --git a/debian/coq-libs.install b/debian/coq-libs.install
deleted file mode 100644
index a2671191..00000000
--- a/debian/coq-libs.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/coq/contrib
-usr/lib/coq/states
-usr/lib/coq/theories
diff --git a/debian/coq-libs.install.in b/debian/coq-libs.install.in
new file mode 100644
index 00000000..ebc03395
--- /dev/null
+++ b/debian/coq-libs.install.in
@@ -0,0 +1,2 @@
+# *.vo files will be added here
+
diff --git a/debian/coq.install.in b/debian/coq.install.in
index 3b6d66a1..d658e513 100644
--- a/debian/coq.install.in
+++ b/debian/coq.install.in
@@ -8,6 +8,12 @@ usr/bin/coq-tex*
 usr/bin/coqtop*
 usr/bin/coqwc*
 usr/bin/gallina*
+usr/lib/coq/revision
+usr/lib/coq/contrib/micromega/csdpcert
+usr/lib/coq/contrib/interface/vernacrc
+usr/lib/coq/tools/coqdoc/coqdoc.css
+usr/lib/coq/tools/coqdoc/coqdoc.sty
+usr/lib/coq/states/initial.coq
 usr/share/emacs/site-lisp/coq/
 usr/share/man/man1/coqc*
 usr/share/man/man1/coqdep*
diff --git a/debian/coqide.install b/debian/coqide.install
index dd6bf116..52eec4db 100644
--- a/debian/coqide.install
+++ b/debian/coqide.install
@@ -1,4 +1,5 @@
 usr/bin/coqide*
 usr/lib/coq/ide/coq.png
 usr/lib/coq/ide/.coqide-gtk2rc
+usr/lib/coq/ide/FAQ
 usr/share/man/man1/coqide*
diff --git a/debian/rules b/debian/rules
index 58ad7e19..ec73497d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@ HTMLDOC := doc/stdlib/html/index.html
 COQPREF := $(CURDIR)/debian/tmp
 ADDPREF := COQINSTALLPREFIX=$(COQPREF)
 
+ARCH_PKGS := coq coqide libcoq-ocaml-dev
+
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 OCAMLABI := $(shell ocamlc -version)
 
@@ -24,9 +26,10 @@ CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \
   --browser "/usr/bin/x-www-browser %s &" \
   --with-doc no --coqrunbyteflags "-dllib -lcoqrun"
 
-OCAMLINITSED := -e 's/@OCamlABI@/$(OCAMLABI)/g'
+OCAMLINITSED := -e 's/@OCamlABI@/$(OCAMLABI)/g' -e '/^\#/d'
+OCAMLOPT := $(wildcard /usr/bin/ocamlopt*)
 
-ifeq ($(shell test -e /usr/bin/ocamlopt && echo yes),yes)
+ifneq ($(OCAMLOPT),)
   CONFIGUREOPTS += -opt
   OCAMLINITSED += -e 's/^OPT: //'
 else
@@ -58,8 +61,12 @@ install: install-stamp
 install-stamp: build-stamp
 	dh install --before dh_auto_install
 	$(MAKE) $(ADDPREF) install
-	dh_install -XFAQ --list-missing
-	mv debian/coq-libs/usr/lib/coq/contrib/micromega/csdpcert debian/coq/usr/lib/coq/contrib/micromega
+	find debian/tmp -regextype posix-awk \
+	  -regex '.*\.(cm[aoxi]|cmxa|[ao])$$' \
+	  >> debian/libcoq-ocaml-dev.install
+	find debian/tmp -name '*.vo' -printf '%P\n' \
+	  >> debian/coq-libs.install
+	dh_install --list-missing
 	cp debian/coq.xpm debian/coq/usr/share/pixmaps
 	cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
 	cp debian/coqide.desktop debian/coqide/usr/share/applications
@@ -69,13 +76,13 @@ install-stamp: build-stamp
 
 clean: unpatch
 	dh $@
-	rm -f debian/substvars $(OFILES)
+	rm -f $(OFILES)
 
 binary-indep: install-stamp
 	dh $@
 
 binary-arch: install-stamp
-	for u in coq coqide; do echo 'F:OCamlABI=$(OCAMLABI)' >> debian/$$u.substvars; done
+	for u in $(ARCH_PKGS); do echo 'F:OCamlABI=$(OCAMLABI)' >> debian/$$u.substvars; done
 	dh $@
 
 binary: binary-indep binary-arch