[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.2.2-2-8-gc520b27

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 1b05b2bca2581526e7762c4a9275b8ca7eac18ce
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Nov 4 09:23:49 2011 +0100

    Remove 0001-Add-Set-an-installation-prefix-path.patch, fixed upstream

diff --git a/debian/patches/0001-Add-Set-an-installation-prefix-path.patch b/debian/patches/0001-Add-Set-an-installation-prefix-path.patch
deleted file mode 100644
index 176d4f4..0000000
--- a/debian/patches/0001-Add-Set-an-installation-prefix-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Wed, 14 Jul 2010 21:35:14 +0200
-Subject: Add/Set an installation prefix path
-
----
- Makefile |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b5101e2..e8f1c4c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,7 @@ VERSION := $(shell cat VERSION)
- 
- # Define variables and export them for mkconf.ml
- DOCROOT ?= /usr/share/doc/ocaml-batteries
-+PREFIX ?= $(shell ocamlc -where)
- export DOCROOT
- BROWSER_COMMAND ?= x-www-browser %s
- export BROWSER_COMMAND
-@@ -53,11 +54,12 @@ doc:
- 	test -e apidocs || ln -s _build/batteries.docdir apidocs
- 
- install: all
--	ocamlfind install estring libs/estring/META \
-+	ocamlfind install -destdir $(PREFIX) estring \
-+		libs/estring/META \
- 		_build/libs/estring/*.cmo \
- 		_build/libs/estring/*.cmi \
- 		_build/libs/estring/*.mli
--	ocamlfind install $(NAME) $(INSTALL_FILES)
-+	ocamlfind install -destdir $(PREFIX) $(NAME) $(INSTALL_FILES)
- 
- uninstall:
- 	ocamlfind remove estring
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 64ea983..a4086ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Add-Set-an-installation-prefix-path.patch
 0002-Fix-build-with-OCaml-3.12.0.patch
 0003-Do-not-enforce-sanity-check-rules.patch
 0004-Fix-build-with-camomile-0.8.3.patch
diff --git a/debian/rules b/debian/rules
index afaf256..d13cc96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	mkdir -p $(DEB_DESTDIR)/estring $(DEB_DESTDIR)/batteries $(BATTERIES_DEB_DOCROOT)
-	make PREFIX=$(DEB_DESTDIR) install
+	make DESTDIR=$(DEB_DESTDIR) install
 ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages)))
 	make DOCROOT=$(BATTERIES_DEB_DOCROOT) install-doc
 endif

-- 
ocaml-batteries packaging