[Pkg-ocaml-maint-commits] [ocaml] 01/01: Fix some install paths

[Ximin Luo]

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

infinity0 pushed a commit to branch debian/experimental
in repository ocaml.

commit 9c1fa648a458074a633aa78d4b3fc2649a132f2d
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Mar 3 18:39:21 2017 +0100

    Fix some install paths
---
 debian/ocaml-nox.install.in                      |  2 +-
 debian/patches/0011-fix-nonnative-ocamlopt.patch | 11 +++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index a3f7337..f39299d 100644
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -12,7 +12,7 @@
      usr/bin/ocamlc.*
      usr/bin/ocamlcp.*
      usr/bin/ocamldep.*
-     usr/bin/ocamldoc.*
+OPT: usr/bin/ocamldoc.opt
      usr/bin/ocamllex.*
      usr/bin/ocamlmklib.*
      usr/bin/ocamlmktop.*
diff --git a/debian/patches/0011-fix-nonnative-ocamlopt.patch b/debian/patches/0011-fix-nonnative-ocamlopt.patch
new file mode 100644
index 0000000..ecfb40d
--- /dev/null
+++ b/debian/patches/0011-fix-nonnative-ocamlopt.patch
@@ -0,0 +1,11 @@
+--- a/tools/Makefile.shared
++++ b/tools/Makefile.shared
+@@ -135,7 +135,7 @@
+ 	       arg_helper.cmo clflags.cmo main_args.cmo
+ 
+ $(call byte_and_opt,ocamlcp,$(ocamlcp_cmos) ocamlcp.cmo,)
+-$(call byte_and_opt,ocamloptp,$(ocamlcp_cmos) ocamloptp.cmo,)
++$(call byte_and_opt,ocamloptp,$(ocamloptp_cmos) ocamloptp.cmo,)
+ 
+ opt:: profiling.cmx
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c7d6753..ca0d3bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
 0009-Skip-native-tests.patch
 0010-arm-default-PIC.patch
+0011-fix-nonnative-ocamlopt.patch

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