[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9fd4621dcafc03b56c348a0342b2d172c065121d
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Aug 8 15:25:39 2008 +0200

    Add use-env-in-coq-config.dpatch
    
    Use environment variables by default in coq_config.ml. This allows
    the run of micromega-related tests before installation.

diff --git a/debian/patches/00list b/debian/patches/00list
index a86c496..3e9df43 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 no-complexity-test
 check
+use-env-in-coq-config
diff --git a/debian/patches/use-env-in-coq-config.dpatch b/debian/patches/use-env-in-coq-config.dpatch
new file mode 100755
index 0000000..1f01315
--- /dev/null
+++ b/debian/patches/use-env-in-coq-config.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-env-in-coq-config.dpatch by Stephane Glondu <steph at glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use environment variables by default in coq_config.ml
+
+ at DPATCH@
+diff --git a/configure b/configure
+index 2747ee2..a57b996 100755
+--- a/configure
++++ b/configure
+@@ -862,9 +862,9 @@ cat << END_OF_COQ_CONFIG > $mlconfig_file
+ (* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
+ 
+ let local = $local
+-let bindir = "$ESCBINDIR" 
+-let coqlib = "$ESCLIBDIR"
+-let coqtop = "$ESCCOQTOP"
++let bindir = try Sys.getenv "COQBIN" with Not_found -> "$ESCBINDIR"
++let coqlib = try Sys.getenv "COQLIB" with Not_found -> "$ESCLIBDIR"
++let coqtop = try Sys.getenv "COQTOP" with Not_found -> "$ESCCOQTOP"
+ let camldir = "$ESCCAMLDIR"
+ let camllib = "$ESCCAMLLIB"
+ let camlp4 = "$CAMLP4"

-- 
coq packaging