[Pkg-ocaml-maint-commits] r3430 - in /trunk/packages/cryptgps/trunk/debian: patches/destdir.dpatch rules

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jan  2 16:01:06 2007
New Revision: 3430

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3430
Log:
enable installation in debian-specific directory

Added:
    trunk/packages/cryptgps/trunk/debian/patches/destdir.dpatch   (with props)
Modified:
    trunk/packages/cryptgps/trunk/debian/rules

Added: trunk/packages/cryptgps/trunk/debian/patches/destdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptgps/trunk/debian/patches/destdir.dpatch?rev=3430&op=file
==============================================================================
--- trunk/packages/cryptgps/trunk/debian/patches/destdir.dpatch (added)
+++ trunk/packages/cryptgps/trunk/debian/patches/destdir.dpatch Tue Jan  2 16:01:06 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: enable external overriding of target installation directory
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2001-07-19 21:00:41.000000000 +0200
++++ trunk/Makefile	2007-01-02 15:59:26.000000000 +0100
+@@ -42,6 +42,8 @@
+ OCAMLDEP  = ocamldep $(OPTIONS)
+ OCAMLFIND = ocamlfind
+ 
++DESTDIR = $(shell ocamlfind printconf destdir)/$(NAME)
++
+ depend: *.ml *.mli
+ 	$(OCAMLDEP) *.ml *.mli >depend
+ 
+@@ -51,7 +53,7 @@
+ .PHONY: install
+ install: all
+ 	{ test ! -f $(XARCHIVE) || extra="*.cmxa *.a"; }; \
+-	$(OCAMLFIND) install $(NAME) *.mli *.cmi *.cma META $$extra
++	$(OCAMLFIND) install -destdir $(DESTDIR) $(NAME) *.mli *.cmi *.cma META $$extra
+ 
+ .PHONY: uninstall
+ uninstall:

Propchange: trunk/packages/cryptgps/trunk/debian/patches/destdir.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/cryptgps/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptgps/trunk/debian/rules?rev=3430&op=diff
==============================================================================
--- trunk/packages/cryptgps/trunk/debian/rules (original)
+++ trunk/packages/cryptgps/trunk/debian/rules Tue Jan  2 16:01:06 2007
@@ -5,20 +5,14 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 
 PKGNAME = libcryptgps-ocaml-dev
-DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
-DOCDIR = $(CURDIR)/debian/doc/html
+DESTDIR := $(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)/cryptgps
 
+DEB_MAKE_BUILD_TARGET = all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	DEB_MAKE_BUILD_TARGET = opt NO_CUSTOM=y
-	DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) NATIVE=true
-else
-	DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
-	DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
+	DEB_MAKE_BUILD_TARGET += opt
 endif
 
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 build/$(PKGNAME)::
-	mkdir -p $(DESTDIR) $(DOCDIR)
-	ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
-clean::
-	rm -rf debian/doc ocamldoc-stamp
+	mkdir -p $(DESTDIR)