[Pkg-ocaml-maint-commits] [cmdliner] 04/05: Meh...

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository cmdliner.

commit 47352f765e2bbbb585f64075a5a95598a26164be
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Mar 27 21:50:08 2014 +0100

    Meh...
---
 debian/changelog                  |  2 ++
 debian/libcmdliner-ocaml-dev.docs |  4 ++--
 debian/rules                      | 17 +++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e14d782..ba2b084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cmdliner (0.9.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Use a new build system in order to aboid unnecessary new build
+    dependencies.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Thu, 27 Mar 2014 21:04:32 +0100
 
diff --git a/debian/libcmdliner-ocaml-dev.docs b/debian/libcmdliner-ocaml-dev.docs
index d2fcd72..9a2569e 100644
--- a/debian/libcmdliner-ocaml-dev.docs
+++ b/debian/libcmdliner-ocaml-dev.docs
@@ -1,3 +1,3 @@
-README
-CHANGES
+README.md
+CHANGES.md
 doc
diff --git a/debian/rules b/debian/rules
index d9a63d0..f2833c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,28 +3,33 @@
 
 DESTDIR=$(CURDIR)/debian/tmp
 include /usr/share/ocaml/ocamlvars.mk
-OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)/cmdliner
 export OCAMLFIND_DESTDIR
 
+TARGETS=cmdliner.cmi cmdliner.cma
+ifeq ($(OCAML_BEST),opt)
+TARGETS+=cmdliner.a cmdliner.cmx cmdliner.cmxa cmdliner.cmxs
+endif
+
+TO_INSTALL=$(addprefix _build/src/,$(TARGETS)) pkg/META src/cmdliner.mli
+
 %:
 	dh $@ --with ocaml
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --enable-tests
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	ocaml setup.ml -build
+	ocamlbuild -classic-display $(TARGETS)
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
-	ocaml setup.ml -test
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
 	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	ocaml setup.ml -install
+	cp $(TO_INSTALL) '$(OCAMLFIND_DESTDIR)'
 
 .PHONY: override_dh_install
 override_dh_install:
@@ -32,4 +37,4 @@ override_dh_install:
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-	ocaml setup.ml -distclean
+	ocamlbuild -classic-display -clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmdliner.git