[Pkg-ocaml-maint-commits] [SCM] syslog-ocaml packaging branch, master, updated. debian/1.4-1-11-g1e567b9

[Eric Cooper]

The following commit has been merged in the master branch:
commit 36b54fc8805388574a1679a81a90e5ceaf1f191f
Author: Eric Cooper <ecc at cmu.edu>
Date:   Tue Oct 6 12:05:38 2009 -0400

    use DESTDIR with ocamlfind for install target
    
    specify NO_CUSTOM=y in debian/rules rather than Makefile

diff --git a/Makefile b/Makefile
index 5863c51..8e041e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
-OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+OCAMLMAKEFILE=/usr/share/ocamlmakefile/OCamlMakefile
 
 SOURCES=aux.mli aux.ml aux_stubs.c syslog.mli syslog.ml
 RESULT=syslog
 PACKS=unix
-NO_CUSTOM = yes
 
 LIBINSTALL_FILES=$(wildcard *.mli *.cmi *.cma *.cmx *.cmxa *.a *.so)
 
diff --git a/debian/libsyslog-ocaml-dev.install.in b/debian/libsyslog-ocaml-dev.install.in
index 6ff904d..1a8c2dc 100644
--- a/debian/libsyslog-ocaml-dev.install.in
+++ b/debian/libsyslog-ocaml-dev.install.in
@@ -1 +1,4 @@
-{META,*.mli,*.cmi,*.cm*a,*.a}	@OCamlStdlibDir@/syslog
+ at OCamlStdlibDir@/syslog/META
+ at OCamlStdlibDir@/syslog/*.a
+ at OCamlStdlibDir@/syslog/*.cm*
+ at OCamlStdlibDir@/syslog/*.ml*
diff --git a/debian/libsyslog-ocaml.install.in b/debian/libsyslog-ocaml.install.in
index b21a8fd..b8940b6 100644
--- a/debian/libsyslog-ocaml.install.in
+++ b/debian/libsyslog-ocaml.install.in
@@ -1 +1 @@
-dllsyslog_stubs.so	@OCamlStdlibDir@/stublibs
+ at OCamlStdlibDir@/syslog/*.so	@OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 594b892..3ff3543 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET = libinstall OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
-DEB_MAKE_BUILD_TARGET = byte-code-library
+DEB_MAKE_BUILD_TARGET = byte-code-library NO_CUSTOM=y
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
     DEB_MAKE_BUILD_TARGET += native-code-library
 endif
+
+build/libsyslog-ocaml::
+	mkdir -p $(DESTDIR)

-- 
syslog-ocaml packaging