[Pkg-ocaml-maint-commits] [dh-ocaml] 01/01: debhelper/dh_ocamlinit: also check for ocamlopt when filtering DYN lines

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository dh-ocaml.

commit 2111646ccf3b07c7ee09a6367d62826c75224acf
Author: Johannes Schauer <josch at debian.org>
Date:   Sun Jan 31 16:39:31 2016 +0100

    debhelper/dh_ocamlinit: also check for ocamlopt when filtering DYN lines
    
    cmxs files only get generated when ocamlopt exists. By making this
    requirement explicit when filtering DYN lines in debian/*install.in
    files, "emulating" a non-native build now just requires the deletion of
    ocamlopt and not also the deletion of dynlink.cmxa.
---
 debhelper/dh_ocamlinit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debhelper/dh_ocamlinit b/debhelper/dh_ocamlinit
index 3d99612..6d7b5da 100755
--- a/debhelper/dh_ocamlinit
+++ b/debhelper/dh_ocamlinit
@@ -84,7 +84,7 @@ if (-x $ocamlopt) {
     $ocamlinit_sed .= " -e '/^OPT: /d' -e 's/^BYTE: //'";
 }
 
-if (-f $dynlinkcmxa) {
+if (-x $ocamlopt && -f $dynlinkcmxa) {
     $ocamlinit_sed .= " -e 's/^DYN: //'";
 } else {
     $ocamlinit_sed .= " -e '/^DYN: /d'";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dh-ocaml.git