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 (file)
index ecfb40d..0000000
--- 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 ca0d3bc5483dd503bfbef1256a52ef57def3433d..c7d67535f8e0b7bd4019d521195e09d8b94273a6 100644 (file)
--- 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 842ac388f6edf7ad0e16a2dcb183fc7c8d97a397..e9fc69e5b7b5b01389bf5e58792fcc9f149ab679 100755 (executable)
--- 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