[Pkg-ocaml-maint-commits] r6392 - in /trunk/packages/ocamlcreal/trunk/debian: control rules

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Wed Jun 24 20:24:30 2009
New Revision: 6392

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6392
Log:
Remove usage of old Ocaml's Standard library location and add dh-ocaml as a build-dep

Modified:
    trunk/packages/ocamlcreal/trunk/debian/control
    trunk/packages/ocamlcreal/trunk/debian/rules

Modified: trunk/packages/ocamlcreal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlcreal/trunk/debian/control?rev=6392&op=diff
==============================================================================
--- trunk/packages/ocamlcreal/trunk/debian/control (original)
+++ trunk/packages/ocamlcreal/trunk/debian/control Wed Jun 24 20:24:30 2009
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: ocaml-nox (>= 3.10.0), debhelper (>= 4.0.0), dpatch, libgmp-ocaml-dev
+Build-Depends: ocaml-nox (>= 3.10.0), debhelper (>= 4.0.0), dpatch, libgmp-ocaml-dev, dh-ocaml (>= 0.4.1)
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlcreal/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlcreal/trunk/

Modified: trunk/packages/ocamlcreal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlcreal/trunk/debian/rules?rev=6392&op=diff
==============================================================================
--- trunk/packages/ocamlcreal/trunk/debian/rules (original)
+++ trunk/packages/ocamlcreal/trunk/debian/rules Wed Jun 24 20:24:30 2009
@@ -3,6 +3,7 @@
 PACKAGE=libcreal-ocaml-dev
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlvars.mk
 OCAMLABI = $(shell ocamlc -version)
 
 config.status: patch-stamp configure
@@ -32,8 +33,9 @@
 	dh_clean -k 
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)
-	cp debian/META debian/$(PACKAGE)/usr/lib/ocaml/$(OCAMLABI)/creal
+	mkdir -p $(CURDIR)/debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
+	$(MAKE) install LIBDIR=$(CURDIR)/debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
+	cp debian/META debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
 
 
 # Build architecture-independent files here.