Fix some install paths

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index a3f733785ac10a734ab51df768d0eb7e950d7b7d..f39299d8dddba2b3032ff875dafe9ee6bb9c5f63 100644 (file)
--- 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 (file)
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 c7d67535f8e0b7bd4019d521195e09d8b94273a6..ca0d3bc5483dd503bfbef1256a52ef57def3433d 100644 (file)
--- 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