[Pkg-ocaml-maint-commits] [ocplib-simplex] 01/01: install target : install in LIBDIR

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository ocplib-simplex.

commit 7b580b7dbe455c4a566bec239c24baa309786131
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Nov 25 07:15:07 2016 +0100

    install target : install in LIBDIR
---
 debian/patches/install-target | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  5 -----
 debian/source/format          |  1 +
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/patches/install-target b/debian/patches/install-target
new file mode 100644
index 0000000..d40fd9b
--- /dev/null
+++ b/debian/patches/install-target
@@ -0,0 +1,32 @@
+Author: Ralf Treinen <treinen.debian.org>
+Description: make install should hnour $(DESTDIR), and install in OCAMLLLIB
+Upstream-bug: https://github.com/OCamlPro-Iguernlala/ocplib-simplex/issues/3
+
+Index: ocplib-simplex/Makefile.in
+===================================================================
+--- ocplib-simplex.orig/Makefile.in	2016-11-25 07:16:31.462449248 +0100
++++ ocplib-simplex/Makefile.in	2016-11-25 07:18:03.262827029 +0100
+@@ -13,11 +13,11 @@
+ # (enclosed in the file LGPL).
+ 
+ # where to install the binaries
+-# DESTDIR=
++DESTDIR=
+ # prefix=@prefix@
+ # exec_prefix=@exec_prefix@
+ # BINDIR=$(DESTDIR)@bindir@
+-# LIBDIR=$(DESTDIR)@libdir@/ocplib-simplex
++LIBDIR=$(DESTDIR)@OCAMLLIB@/
+ # DATADIR=$(DESTDIR)@datadir@/ocplib-simplex
+ 
+ # where to install the man page
+@@ -112,7 +112,8 @@
+ ##############
+ 
+ install: all META
+-	ocamlfind install ocplib-simplex src/$(LIBNAME).* src/*.mli META
++	OCAMLFIND_DESTDIR=$(LIBDIR) \
++	  ocamlfind install ocplib-simplex src/$(LIBNAME).* src/*.mli META
+ 
+ 
+ uninstall:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a7500b3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install-target
diff --git a/debian/rules b/debian/rules
index 80eae23..b577480 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,4 @@
 #!/usr/bin/make -f
-PACKAGEDIR=debian/ocplib-simplex-ocaml-dev
-OCAMLLIBDIR=/usr/lib/ocaml
 
 %:
 	dh $@ --with ocaml
-
-override_dh_auto_install:
-	OCAMLFIND_DESTDIR=$(PACKAGEDIR)/$(OCAMLLIBDIR) $(MAKE) install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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