[Pkg-ocaml-maint-commits] r2169 - trunk/packages/ocaml-expat/trunk/debian

[Enrico Tassi]

Author: gares-guest
Date: 2005-11-27 15:31:49 +0000 (Sun, 27 Nov 2005)
New Revision: 2169

Modified:
   trunk/packages/ocaml-expat/trunk/debian/changelog
   trunk/packages/ocaml-expat/trunk/debian/rules
Log:
fixed .cmxa that was not shipped


Modified: trunk/packages/ocaml-expat/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/changelog	2005-11-27 15:18:51 UTC (rev 2168)
+++ trunk/packages/ocaml-expat/trunk/debian/changelog	2005-11-27 15:31:49 UTC (rev 2169)
@@ -1,6 +1,10 @@
 ocaml-expat (0.9.1-3) unstable; urgency=low
 
   * rebuilt against ocaml 3.09.0
+  * moved debian/rules to cdbs
+  * no more ocaml-version hardcoded inside any file. @OCamlABI@ is substituted
+    in any FILE.in file (except control.in) at build time by the ocamlinit:
+    rule producing the corresponding FILE in debian/.
 
  -- Enrico Tassi <gareuselesinge at users.sourceforge.net>  Sat, 26 Nov 2005 22:15:07 +0100
 

Modified: trunk/packages/ocaml-expat/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/rules	2005-11-27 15:18:51 UTC (rev 2168)
+++ trunk/packages/ocaml-expat/trunk/debian/rules	2005-11-27 15:31:49 UTC (rev 2169)
@@ -11,9 +11,14 @@
 HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
 DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
 DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
-DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 
+ifeq ($(HAVE_OCAMLOPT),yes)
+	DEB_MAKE_BUILD_TARGET = allopt NO_CUSTOM=y
+else
+	DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
+endif
+
 # expand @OCamlABI@ insinde *.in (all but control.in)
 ocamlinit:
 	for f in $(OFILES); do \