[Pkg-ocaml-maint-commits] r2041 - trunk/packages/postgresql-ocaml/trunk/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-13 14:38:00 +0000 (Sun, 13 Nov 2005)
New Revision: 2041

Modified:
   trunk/packages/postgresql-ocaml/trunk/debian/changelog
   trunk/packages/postgresql-ocaml/trunk/debian/rules
Log:
fix for non native archs


Modified: trunk/packages/postgresql-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/changelog	2005-11-13 14:34:41 UTC (rev 2040)
+++ trunk/packages/postgresql-ocaml/trunk/debian/changelog	2005-11-13 14:38:00 UTC (rev 2041)
@@ -1,3 +1,11 @@
+postgresql-ocaml (1.4.6-3) unstable; urgency=low
+
+  * debian/rules
+    - proper setting of DEB_MAKE_INSTALL_TARGET when ocamlopt is not
+      available, fixes FTBFS on non native code archs
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 13 Nov 2005 14:35:44 +0000
+
 postgresql-ocaml (1.4.6-2) unstable; urgency=low
 
   * Rebuilt with ocaml 3.09

Modified: trunk/packages/postgresql-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/rules	2005-11-13 14:34:41 UTC (rev 2040)
+++ trunk/packages/postgresql-ocaml/trunk/debian/rules	2005-11-13 14:38:00 UTC (rev 2041)
@@ -13,22 +13,20 @@
 DEB_MAKE_BUILD_TARGET = byte-code-library
 CFLAGS += -I$(shell pg_config --includedir) -fPIC
 DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
-BYTE_STUFF="libpostgresql_stubs.a postgresql.cma postgresql.cmi postgresql.mli dllpostgresql_stubs.so"
-
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) -C $(DEB_SRCDIR)/ native-code-library
-DEB_MAKE_INSTALL_TARGET = \
-	install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
-else
-DEB_MAKE_INSTALL_TARGET = \
-	install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR) \
-		LIBINSTALL_FILES=$(BYTE_STUFF)
 endif
+
+ifneq ($(HAVE_OCAMLOPT),yes)
+export LIBINSTALL_FILES = libpostgresql_stubs.a postgresql.cma postgresql.cmi postgresql.mli dllpostgresql_stubs.so
+endif
+
 binary-install/$(PKGNAME)::
 	mv $(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)/postgresql/*.so \
 		$(CURDIR)/debian/$(patsubst %-dev,%,$(PKGNAME))$(OCAMLLIBDIR)/stublibs/