[Pkg-ocaml-maint-commits] [SCM] ocaml-gnuplot packaging branch, master, updated. upstream/0.8.3-19-g95fa3c7

Ralf Treinen treinen at debian.org
Wed Feb 1 19:55:26 UTC 2012


The following commit has been merged in the master branch:
commit db0d4026b59747d5cc5cf341633947ee78fb2e73
Author: Ralf Treinen <treinen at debian.org>
Date:   Mon Jan 30 17:08:46 2012 +0100

    fix install target

diff --git a/debian/libgnuplot-ocaml-dev.dirs b/debian/libgnuplot-ocaml-dev.dirs
new file mode 100644
index 0000000..00a96ae
--- /dev/null
+++ b/debian/libgnuplot-ocaml-dev.dirs
@@ -0,0 +1 @@
+usr/lib/ocaml
diff --git a/debian/patches/make_install b/debian/patches/make_install
index d954294..5c36d6f 100644
--- a/debian/patches/make_install
+++ b/debian/patches/make_install
@@ -3,18 +3,18 @@ Description: honor $(PREFIX) when installing libraries
 
 Index: ocaml-gnuplot/Makefile
 ===================================================================
---- ocaml-gnuplot.orig/Makefile	2012-01-27 16:56:36.000000000 +0100
-+++ ocaml-gnuplot/Makefile	2012-01-27 16:57:56.000000000 +0100
+--- ocaml-gnuplot.orig/Makefile	2012-01-30 17:05:31.000000000 +0100
++++ ocaml-gnuplot/Makefile	2012-01-30 17:08:15.000000000 +0100
 @@ -73,10 +73,10 @@
  # Installation
  .PHONY: install
  install: META all
 -	$(OCAMLFIND) install $(PKGNAME) META $(INSTALL_FILES)
-+	$(OCAMLFIND) install -destdir $(PREFIX) $(PKGNAME) META $(INSTALL_FILES)
++	$(OCAMLFIND) install -destdir $(DESTDIR)/usr/lib/ocaml $(PKGNAME) META $(INSTALL_FILES)
  
  uninstall:
 -	$(OCAMLFIND) remove $(PKGNAME)
-+	$(OCAMLFIND) remove -destdir $(PREFIX) $(PKGNAME)
++	$(OCAMLFIND) remove -destdir $(DESTDIR)/usr/lib/ocaml $(PKGNAME)
  
  META: META.in
  	$(COPY) $^ $@

-- 
ocaml-gnuplot packaging



More information about the Pkg-ocaml-maint-commits mailing list