[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.12.1-2-4-gead95cd

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 5f7382854e7e5db4ebf402e1e6543ed0cc3150b2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Feb 24 15:37:05 2010 +0100

    Do not force custom mode (Pass NO_CUSTOM=y to make)

diff --git a/debian/changelog b/debian/changelog
index 2e6a29a..ff6c8f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-ocaml (1.12.1-3) UNRELEASED; urgency=low
+
+  * Do not force custom mode (Pass NO_CUSTOM=y to make)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 24 Feb 2010 15:34:22 +0100
+
 postgresql-ocaml (1.12.1-2) unstable; urgency=low
 
   [ Mehdi Dogguy ]
diff --git a/debian/rules b/debian/rules
index 58cac35..b1d1675 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,15 @@ include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = libpostgresql-ocaml-dev
 
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
 DEB_SRCDIR = $(CURDIR)/lib
 DEB_QUILT_TOPDIR = $(CURDIR)
-DEB_MAKE_BUILD_TARGET = byte-code-library
+DEB_MAKE_BUILD_TARGET = NO_CUSTOM=y byte-code-library
 CFLAGS += -I$(shell pg_config --includedir) -fPIC
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
-	$(MAKE) -C $(DEB_SRCDIR)/ native-code-library
+	$(MAKE) NO_CUSTOM=y -C $(DEB_SRCDIR)/ native-code-library
 	cd $(DEB_SRCDIR) && ocamlopt -shared -I . -o postgresql.cmxs -linkall postgresql.cmxa
 endif
 

-- 
postgresql-ocaml packaging