From: Ximin Luo <infinity0@debian.org>
Date: Fri, 3 Mar 2017 17:39:21 +0000 (+0100)
Subject: Fix some install paths
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~78
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c1fa648a458074a633aa78d4b3fc2649a132f2d;p=ocaml.git

Fix some install paths
---

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index a3f73378..f39299d8 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 00000000..ecfb40df
--- /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 c7d67535..ca0d3bc5 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