The following commit has been merged in the master branch: commit 8675aaefc33c5350054f4759538313af7869185f Author: Stephane Glondu <st...@glondu.net> Date: Tue Sep 18 15:48:51 2012 +0200
Update to new upstream build system diff --git a/debian/libssreflect-coq.install b/debian/libssreflect-coq.install index bd710ae..954a1bf 100644 --- a/debian/libssreflect-coq.install +++ b/debian/libssreflect-coq.install @@ -1,2 +1,2 @@ -theories/*.vo usr/lib/coq/user-contrib/Ssreflect + usr/lib/coq/user-contrib/Ssreflect/*.vo html usr/share/doc/libssreflect-coq diff --git a/debian/libssreflect-coq.links b/debian/libssreflect-coq.links deleted file mode 100644 index 0040b22..0000000 --- a/debian/libssreflect-coq.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/coqtop usr/bin/ssrcoq -usr/share/man/man1/coqtop.1.gz usr/share/man/man1/ssrcoq.1.gz diff --git a/debian/libssreflect-ocaml-dev.install.in b/debian/libssreflect-ocaml-dev.install.in index c695c1f..d402bff 100644 --- a/debian/libssreflect-ocaml-dev.install.in +++ b/debian/libssreflect-ocaml-dev.install.in @@ -1,3 +1,2 @@ -src/ssreflect.cmi usr/lib/coq/user-contrib/Ssreflect -OPT: src/ssreflect.cmx usr/lib/coq/user-contrib/Ssreflect -OPT: src/ssreflect.o usr/lib/coq/user-contrib/Ssreflect +usr/lib/coq/user-contrib/Ssreflect/ssrmatching.cmi +usr/lib/coq/user-contrib/Ssreflect/ssreflect.cmi diff --git a/debian/libssreflect-ocaml.install.in b/debian/libssreflect-ocaml.install.in index 995a98c..525b8ff 100644 --- a/debian/libssreflect-ocaml.install.in +++ b/debian/libssreflect-ocaml.install.in @@ -1,2 +1,2 @@ -src/ssreflect.cmo usr/lib/coq/user-contrib/Ssreflect -DYN: src/ssreflect.cmxs usr/lib/coq/user-contrib/Ssreflect + usr/lib/coq/user-contrib/Ssreflect/ssreflect.cma +DYN: usr/lib/coq/user-contrib/Ssreflect/ssreflect.cmxs diff --git a/debian/rules b/debian/rules index 9100fef..f6c3c33 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,14 @@ export COQBIN := /usr/bin/ PACKAGES := $(shell dh_listpackages) -PLUGIN_TARGETS := src/ssreflect.cmo -ifeq ($(OCAML_HAVE_OCAMLOPT),yes) - PLUGIN_TARGETS += src/ssreflect.cmx -endif +INSTALL_DIR := $(CURDIR)/debian/tmp/usr/lib/coq/user-contrib/Ssreflect + +# The following must be kept in sync with d/libssreflect-ocaml*.install.in +PLUGIN_TARGETS := theories/ssreflect.cma ifeq ($(OCAML_NATDYNLINK),yes) - PLUGIN_TARGETS += src/ssreflect.cmxs + PLUGIN_TARGETS += theories/ssreflect.cmxs endif +EXTRA_FILES := src/ssrmatching.cmi src/ssreflect.cmi %: +dh --with ocaml $@ @@ -28,15 +29,23 @@ override_dh_auto_build: # calling build-{arch,indep} targets (see #604397) .PHONY: override_dh_auto_install override_dh_auto_install: - $(MAKE) Makefile.coq ifeq ($(findstring libssreflect-coq,$(PACKAGES)),) - mkdir -p bin +# Express build: only plugins + $(MAKE) Makefile.coq $(MAKE) -f Makefile.coq $(PLUGIN_TARGETS) + install -d $(INSTALL_DIR) + install -m 644 $(PLUGIN_TARGETS) $(EXTRA_FILES) $(INSTALL_DIR) else - $(MAKE) all +# Full build + $(MAKE) + $(MAKE) install DSTROOT=$(CURDIR)/debian/tmp $(MAKE) -f Makefile.coq html endif +.PHONY: override_dh_install +override_dh_install: + dh_install --fail-missing + .PHONY: override_dh_auto_clean override_dh_auto_clean: dh_auto_clean -- ssreflect packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits