From: Ximin Luo <infinity0@debian.org>
Date: Fri, 3 Mar 2017 21:35:06 +0000 (+0100)
Subject: Don't install ocamloptp on non-opt architectures, properly
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~77
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1053f13572176c21683bc8af8783f6135513fc54;p=ocaml.git

Don't install ocamloptp on non-opt architectures, properly
---

diff --git a/debian/patches/0011-fix-nonnative-ocamlopt.patch b/debian/patches/0011-fix-nonnative-ocamlopt.patch
deleted file mode 100644
index ecfb40df..00000000
--- a/debian/patches/0011-fix-nonnative-ocamlopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 ca0d3bc5..c7d67535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
 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
diff --git a/debian/rules b/debian/rules
index 842ac388..e9fc69e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,6 +210,7 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),no)
 	rm -f \
 	  $(INSTDIR)/share/man/man1/ocamloptp.1 \
 	  $(INSTDIR)/share/man/man1/ocamlopt.1 \
+	  $(INSTDIR)/bin/ocamloptp.* \
 	  $(INSTDIR)/bin/ocamloptp
 endif
 # Dispatch files with dh_install