[Pkg-ocaml-maint-commits] r5406 - in /trunk/projects/approx/trunk: Makefile debian/changelog

[ecc-guest at users.alioth.debian.org]

Author: ecc-guest
Date: Tue Apr  1 19:05:31 2008
New Revision: 5406

URL: http://svn.debian.org/wsvn/?sc=1&rev=5406
Log:
pass -byte-plugin flag to ocamlbuild when building bytecode

Modified:
    trunk/projects/approx/trunk/Makefile
    trunk/projects/approx/trunk/debian/changelog

Modified: trunk/projects/approx/trunk/Makefile
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/Makefile?rev=5406&op=diff
==============================================================================
--- trunk/projects/approx/trunk/Makefile (original)
+++ trunk/projects/approx/trunk/Makefile Tue Apr  1 19:05:31 2008
@@ -5,8 +5,11 @@
 OCAMLBUILD := ocamlbuild
 OCAMLBUILD_OPTS := -classic-display
 
-TARGET := $(shell if [ -x /usr/bin/ocamlopt ]; then echo native; \
-		  else echo byte; fi)
+TARGET := native
+
+ifeq ($(TARGET),byte)
+    OCAMLBUILD_OPTS += -byte-plugin
+endif
 
 all:
 	@set -e; for prog in approx gc update; do \
@@ -16,9 +19,6 @@
 	done
 	@mv -v gc gc_approx
 	@mv -v update update_approx
-
-fast:
-	@$(MAKE) all OCAMLBUILD_OPTS=
 
 clean:
 	$(OCAMLBUILD) $(OCAMLBUILD_OPTS) -clean

Modified: trunk/projects/approx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/changelog?rev=5406&op=diff
==============================================================================
--- trunk/projects/approx/trunk/debian/changelog (original)
+++ trunk/projects/approx/trunk/debian/changelog Tue Apr  1 19:05:31 2008
@@ -1,3 +1,10 @@
+approx (3.1.0~rc2) experimental; urgency=low
+
+  * Pass -byte-plugin flag to ocamlbuild when building bytecode
+    (closes: #471665)
+
+ -- Eric Cooper <ecc at cmu.edu>  Tue, 01 Apr 2008 14:49:03 -0400
+
 approx (3.1.0~rc1) experimental; urgency=low
 
   * Added support for IPv6 and TCP wrappers