[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.1.0-1-5-g0b0555f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e17b7274c4d37b754a37dc82c6b5a5d8dbb9adea
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jun 2 19:18:14 2010 +0200

    Fix configuration of Batteries (Closes: #578671).

diff --git a/debian/changelog b/debian/changelog
index 55ff918..f102d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ocaml-batteries (1.1.0-2) unstable; urgency=low
 
   * Add myself to Uploaders (and remove Zack as he asked).
+  * Fix configuration of Batteries (Closes: #578671).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 02 Jun 2010 14:32:05 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 02 Jun 2010 19:17:30 +0200
 
 ocaml-batteries (1.1.0-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 19bdf05..ba7ae8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 include /usr/share/ocaml/ocamlvars.mk
 
-export DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
-export BATTERIES_DOCROOT = $(CURDIR)/debian/tmp/doc
+DEB_DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+BATTERIES_DEB_DOCROOT = $(CURDIR)/debian/tmp/doc
+export BATTERIES_DOCROOT = /usr/share/doc/libbatteries-ocaml-doc/html/api/
+export DESTDIR = $(OCAML_STDLIB_DIR)
 DOC_PKG = libbatteries-ocaml-doc
 OFLAGS = --verbose
 
@@ -23,10 +25,10 @@ override_dh_auto_test:
 	omake $(OFLAGS) test
 
 override_dh_auto_install:
-	mkdir -p $(DESTDIR) $(BATTERIES_DOCROOT)
-	omake $(OFLAGS) install
+	mkdir -p $(DEB_DESTDIR) $(BATTERIES_DEB_DOCROOT)
+	DESTDIR=$(DEB_DESTDIR) omake $(OFLAGS) install
 ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages)))
-	omake $(OFLAGS) install-doc
+	DESTDIR=$(DEB_DESTDIR) BATTERIES_DOCROOT=$(BATTERIES_DEB_DOCROOT) omake $(OFLAGS) install-doc
 endif
 
 override_dh_auto_clean:

-- 
ocaml-batteries packaging