[Pkg-ocaml-maint-commits] [SCM] ocaml-gnuplot packaging branch, master, updated. upstream/0.8.3-26-g49fc5b5

Ralf Treinen treinen at debian.org
Thu Feb 2 14:52:53 UTC 2012


The following commit has been merged in the master branch:
commit afb570e06d011b97acd4f2d21e998ae26eadc1e5
Author: Ralf Treinen <treinen at debian.org>
Date:   Thu Feb 2 15:34:57 2012 +0100

    use $(OCAML_HAVE_OCAMLOPT) to distinguish native from nonnative archs.
    
    Thansk to Mehdi for the hint

diff --git a/debian/rules b/debian/rules
index 50e2e16..ee49ffd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,16 @@
 #!/usr/bin/make	 -f
 
-OPTCOMPILER=/usr/bin/ocamlopt
+include /usr/share/ocaml/ocamlvars.mk
 
 %:
 	dh $@ --with ocaml
 
 override_dh_auto_build:
-	if [ -x $(OPTCOMPILER) ]; then $(MAKE); else $(MAKE) byte; fi
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	$(MAKE)
+else
+	$(MAKE) byte
+endif
 	make doc
 
 override_dh_auto_clean:

-- 
ocaml-gnuplot packaging



More information about the Pkg-ocaml-maint-commits mailing list