[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.10.2-1-5-g7b589a5

[Ralf Treinen]

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

    use $(OCAML_HAVE_OCAMLOPT) to distinguish native from non-native archs

diff --git a/debian/changelog b/debian/changelog
index 3facc9d..a637b34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 advi (1.10.2-2) UNRELEASED; urgency=low
 
   * Fix mode of /usr/share/doc/advi-examples/examples/basics/alltt.sty
+  * debian/rules: use $(OCAML_HAVE_OCAMLOPT) to distinguish native
+    from non-native architectures.
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 26 Dec 2011 16:19:40 +0100
+ -- Ralf Treinen <treinen at debian.org>  Thu, 02 Feb 2012 16:19:05 +0100
 
 advi (1.10.2-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 58614a8..69b2f0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,8 @@
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-OPT                 = false
-OPT                 = $(shell test -x /usr/bin/ocamlopt && echo true)
+
+include /usr/share/ocaml/ocamlvars.mk
 
 %:
 	dh $@ --with tex,ocaml
@@ -20,7 +20,7 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/advi
-ifeq ($(OPT),true)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	-rm -f $(CURDIR)/debian/advi/usr/bin/advi.byt
 else
 	cd $(CURDIR)/debian/advi/usr/bin && mv -f advi.byt advi

-- 
advi packaging